diff options
| author | deva <deva> | 2008-03-17 09:46:10 +0000 |
|---|---|---|
| committer | deva <deva> | 2008-03-17 09:46:10 +0000 |
| commit | 981d6fc44428897455cb5aba6441752123510a3e (patch) | |
| tree | d114d7bd77cae9727cb3bd17a0e62660cdc76724 | |
| parent | dcd55372f7a3ad79969852dad30edd9c30a22c5c (diff) | |
I'm getting kind of tired of ffmpeg not making sure thier internal symbols are defined correctly\!
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | miavd/ffframe.h | 1 | ||||
| -rw-r--r-- | miavd/ffmpeg_encoder.cc | 3 | ||||
| -rw-r--r-- | miavd/ffoutput.h | 2 | ||||
| -rw-r--r-- | miavd/stream.h | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/configure.in b/configure.in index ee532d6..7421159 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ AM_CONFIG_HEADER(config.h) AC_STDC_HEADERS # Local location of libmiav -CXXFLAGS="$CXXFLAGS -I../libmiav" +CXXFLAGS="$CXXFLAGS -I../libmiav -D__STDC_CONSTANT_MACROS" LDFLAGS="$LDFLAGS -L../libmiav" AC_OUTPUT(libmiav/Makefile) diff --git a/miavd/ffframe.h b/miavd/ffframe.h index fec820d..d628962 100644 --- a/miavd/ffframe.h +++ b/miavd/ffframe.h @@ -27,6 +27,7 @@ #ifndef __FFMPEGPP_FRAME_H__ #define __FFMPEGPP_FRAME_H__ +#include <stdint.h> extern "C" { #include <ffmpeg/avformat.h> #include <ffmpeg/avcodec.h> diff --git a/miavd/ffmpeg_encoder.cc b/miavd/ffmpeg_encoder.cc index 4f58f08..b80b518 100644 --- a/miavd/ffmpeg_encoder.cc +++ b/miavd/ffmpeg_encoder.cc @@ -30,8 +30,11 @@ #include "miav_config.h" #include <math.h> +#include <stdint.h> +extern "C" { #include <ffmpeg/avcodec.h> #include <ffmpeg/avformat.h> +} #define AUDIO_BUFFER_SIZE DV_AUDIO_MAX_SAMPLES //(DV_AUDIO_MAX_SAMPLES * sizeof(int16_t)) diff --git a/miavd/ffoutput.h b/miavd/ffoutput.h index 8074b83..922f7d2 100644 --- a/miavd/ffoutput.h +++ b/miavd/ffoutput.h @@ -27,9 +27,7 @@ #ifndef __MIAV_FFOUTPUT_H__ #define __MIAV_FFOUTPUT_H__ -#define __STDC_CONSTANT_MACROS #include <stdint.h> - extern "C" { #include <ffmpeg/avformat.h> #include <ffmpeg/avcodec.h> diff --git a/miavd/stream.h b/miavd/stream.h index a929243..15f7b0a 100644 --- a/miavd/stream.h +++ b/miavd/stream.h @@ -27,6 +27,7 @@ #ifndef __FFMPEGPP_STREAM_H__ #define __FFMPEGPP_STREAM_H__ +#include <stdint.h> extern "C" { #include <ffmpeg/avformat.h> #include <ffmpeg/avcodec.h> |