diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:02:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:02:25 -0300 |
| commit | b13e61d6296e4f91f1f495ff436c61ad5de323fb (patch) | |
| tree | e306b7d70277fdc3016df098204abfc7451eb804 | |
| parent | 51b88c3d4eb5838975b7338bc85a77a38b3f1af8 (diff) | |
| parent | c06e73929199c4bdbb32ffb3d81c27ea57dd1458 (diff) | |
| download | ffmpeg-b13e61d6296e4f91f1f495ff436c61ad5de323fb.tar.gz | |
Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'
* commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458':
lavc: Drop deprecated extended aspect ratio symbol
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/h263.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 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 |