summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 12:46:12 +0100
committerAnton Khirnov <anton@khirnov.net>2011-04-19 18:28:39 +0200
commit583f6c67b6edfb6a6202944b8ba98b483826a1ec (patch)
tree5ab5c478e8e5e2f50fcacd545e8ec62de10924ea /libavformat
parentfc2d3a19c54ad6b272eb7d5142148a01568a9b77 (diff)
lavf: remove FF_API_PARAMETERS_CODEC_ID cruft
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h4
-rw-r--r--libavformat/version.h3
2 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d507c2048b..4ed791b995 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -242,10 +242,6 @@ typedef struct AVFormatParameters {
unsigned int initial_pause:1; /**< Do not begin to play the stream
immediately (RTSP only). */
unsigned int prealloced_context:1;
-#if FF_API_PARAMETERS_CODEC_ID
- attribute_deprecated enum CodecID video_codec_id;
- attribute_deprecated enum CodecID audio_codec_id;
-#endif
} AVFormatParameters;
//! Demuxer will use avio_open, no opened file should be provided by the caller.
diff --git a/libavformat/version.h b/libavformat/version.h
index 484ebecb9c..11b8b0529f 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -50,9 +50,6 @@
#ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
-#ifndef FF_API_PARAMETERS_CODEC_ID
-#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
#ifndef FF_API_FIRST_FORMAT
#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif