From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 12:31:55 +0000 (+0100)
Subject: lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
X-Git-Tag: v9_beta1~3301
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b32e30faa17939a8b98062f6219cc4574517f697;p=platform%2Fupstream%2Flibav.git

lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
---

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f875c3d..8f02941 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -569,15 +569,6 @@ typedef struct AVStream {
 #endif
     enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
 
-#if FF_API_AVSTREAM_QUALITY
-    //FIXME move stuff to a flags field?
-    /**
-     * Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
-     * MN: dunno if that is the right place for it
-     */
-    attribute_deprecated float quality;
-#endif
-
     /**
      * Decoding: pts of the first frame of the stream, in stream time base.
      * Only set this if you are absolutely 100% sure that the value you set
diff --git a/libavformat/version.h b/libavformat/version.h
index 3246707..d6bf49b 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_AVSTREAM_QUALITY
-#define FF_API_AVSTREAM_QUALITY        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_LOOP_INPUT
 #define FF_API_LOOP_INPUT              (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif