har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-23 15:02:25 -03:00
commit b13e61d629
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@ -1944,10 +1944,6 @@ typedef struct AVCodecContext {
*/ */
int coded_width, coded_height; 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 * the number of pictures in a group of pictures, or 0 for intra_only
* - encoding: Set by user. * - encoding: Set by user.

2
libavcodec/h263.h
View File

@ -27,9 +27,7 @@
#include "h263data.h" #include "h263data.h"
#include "rl.h" #include "rl.h"
#if !FF_API_ASPECT_EXTENDED
#define FF_ASPECT_EXTENDED 15 #define FF_ASPECT_EXTENDED 15
#endif
#define INT_BIT (CHAR_BIT * sizeof(int)) #define INT_BIT (CHAR_BIT * sizeof(int))
// The defines below define the number of bits that are read at once for // The defines below define the number of bits that are read at once for

3
libavcodec/version.h
View File

@ -57,9 +57,6 @@
#ifndef FF_API_DEBUG_MV #ifndef FF_API_DEBUG_MV
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
#endif #endif
#ifndef FF_API_ASPECT_EXTENDED
#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ARCH_ALPHA #ifndef FF_API_ARCH_ALPHA
#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 58)
#endif #endif