diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 14:19:01 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 14:19:01 +0000 |
| commit | 0139fdea086cc13b83889ea60ff1e8bcf31f0cce (patch) | |
| tree | 63e144134d877c8fb44d9128ba866fe06967ebed | |
| parent | d1742ff779bc2d24ccb0d068120705dc78ac184e (diff) | |
| download | ffmpeg-0139fdea086cc13b83889ea60ff1e8bcf31f0cce.tar.gz | |
add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id
fields in AVFormatParameters
Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4e3812be8c..41063d64c3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -75,6 +75,9 @@ #ifndef FF_API_LAVF_UNUSED #define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53) #endif +#ifndef FF_API_PARAMETERS_CODEC_ID +#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53) +#endif /** * I return the LIBAVFORMAT_VERSION_INT constant. You got @@ -282,7 +285,7 @@ typedef struct AVFormatParameters { unsigned int initial_pause:1; /**< Do not begin to play the stream immediately (RTSP only). */ unsigned int prealloced_context:1; -#if LIBAVFORMAT_VERSION_INT < (53<<16) +#if FF_API_PARAMETERS_CODEC_ID attribute_deprecated enum CodecID video_codec_id; attribute_deprecated enum CodecID audio_codec_id; #endif |