[FFmpeg-devel] [PATCH 12/16] lavf: remove FF_API_PARAMETERS_CODEC_ID cruft

[Anton Khirnov]

---
 libavformat/avformat.h |    4 ----
 libavformat/version.h  |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 5109466..b6b79c2 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -230,10 +230,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 url_fopen, no opened file should be provided by the caller.
diff --git a/libavformat/version.h b/libavformat/version.h
index 12d96e7..3d0d4d2 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,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
-- 
1.7.2.3