[FFmpeg-cvslog] Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 15:02:25 2017 -0300| [b13e61d6296e4f91f1f495ff436c61ad5de323fb] | committer: James Almer

Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

* commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458':
  lavc: Drop deprecated extended aspect ratio symbol

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b13e61d6296e4f91f1f495ff436c61ad5de323fb
---

 libavcodec/avcodec.h | 4 ----
 libavcodec/h263.h    | 2 --
 libavcodec/version.h | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5f124a0c24..9581bffd20 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1944,10 +1944,6 @@ typedef struct AVCodecContext {
      */
     int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
      * - encoding: Set by user.
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index d154d36632..f891f72379 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -27,9 +27,7 @@
 #include "h263data.h"
 #include "rl.h"
 
-#if !FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
-#endif
 #define INT_BIT (CHAR_BIT * sizeof(int))
 
 // The defines below define the number of bits that are read at once for
diff --git a/libavcodec/version.h b/libavcodec/version.h
index cf24b41331..59f8d3c7cd 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_ARCH_ALPHA
 #define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


======================================================================

diff --cc libavcodec/version.h
index cf24b41331,bc8bdad0f4..59f8d3c7cd
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,21 -45,8 +45,18 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
- #ifndef FF_API_ASPECT_EXTENDED
- #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
  #ifndef FF_API_ARCH_ALPHA
  #define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif