From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 3 Feb 2011 11:46:12 +0000 (+0100)
Subject: lavf: remove FF_API_PARAMETERS_CODEC_ID cruft
X-Git-Tag: v0.7b2~303
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=583f6c67b6edfb6a6202944b8ba98b483826a1ec;p=platform%2Fupstream%2Flibav.git

lavf: remove FF_API_PARAMETERS_CODEC_ID cruft
---

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d507c20..4ed791b 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 484ebec..11b8b05 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