aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-12-19 10:58:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-12-19 10:58:54 +0000
commit71957315228290507c58610b6da1e60a289f28a1 (patch)
tree6810f5fcada1efd260b9ec6c3882a433af05ecf0 /libavformat
parent626004690c23c981f67228ea325dde3f35193988 (diff)
downloadffmpeg-71957315228290507c58610b6da1e60a289f28a1.tar.gz
Remove *_codec_id from AVFormatParameters with the next major version bump.
AVFormatParameters is never available when needed and is an annoying mess. Originally committed as revision 11267 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 27d3c00370..b7554d4537 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -147,8 +147,10 @@ typedef struct AVFormatParameters {
int initial_pause:1; /**< do not begin to play the stream
immediately (RTSP only) */
int prealloced_context:1;
+#if LIBAVFORMAT_VERSION_INT < (53<<16)
enum CodecID video_codec_id;
enum CodecID audio_codec_id;
+#endif
} AVFormatParameters;
//! demuxer will use url_fopen, no opened file should be provided by the caller