virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Dustin Brody 2011-10-13 03:26:27 -04:00 committed by Anton Khirnov
parent a62d36697d
commit ac90a71459
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@ -1475,12 +1475,12 @@ typedef struct AVCodecContext {
#define FF_ER_CAREFUL 1 #define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2 #define FF_ER_COMPLIANT 2
#define FF_ER_AGGRESSIVE 3 #define FF_ER_AGGRESSIVE 3
#if FF_API_VERY_AGGRESSIVE #if FF_API_ER
#define FF_ER_VERY_AGGRESSIVE 4 #define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5 #define FF_ER_EXPLODE 5
#else #else
#define FF_ER_EXPLODE 4 #define FF_ER_EXPLODE 4
#endif /* FF_API_VERY_AGGRESSIVE */ #endif /* FF_API_ER */
/** /**
* Called at the beginning of each frame to get a buffer for it. * Called at the beginning of each frame to get a buffer for it.

4
libavcodec/options.c
View File

@ -204,9 +204,9 @@ static const AVOption options[]={
{"careful", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, V|D, "er"}, {"careful", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, V|D, "er"},
{"compliant", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_COMPLIANT }, INT_MIN, INT_MAX, V|D, "er"}, {"compliant", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_COMPLIANT }, INT_MIN, INT_MAX, V|D, "er"},
{"aggressive", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_AGGRESSIVE }, INT_MIN, INT_MAX, V|D, "er"}, {"aggressive", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_AGGRESSIVE }, INT_MIN, INT_MAX, V|D, "er"},
#if FF_API_VERY_AGGRESSIVE #if FF_API_ER
{"very_aggressive", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_VERY_AGGRESSIVE }, INT_MIN, INT_MAX, V|D, "er"}, {"very_aggressive", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_VERY_AGGRESSIVE }, INT_MIN, INT_MAX, V|D, "er"},
#endif /* FF_API_VERY_AGGRESSIVE */ #endif /* FF_API_ER */
{"explode", "abort decoding on error recognition", 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_EXPLODE }, INT_MIN, INT_MAX, V|D, "er"}, {"explode", "abort decoding on error recognition", 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_EXPLODE }, INT_MIN, INT_MAX, V|D, "er"},
{"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
{"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},

4
libavcodec/version.h
View File

@ -77,8 +77,8 @@
#ifndef FF_API_DRC_SCALE #ifndef FF_API_DRC_SCALE
#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_VERY_AGGRESSIVE #ifndef FF_API_ER
#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_ER (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_AVCODEC_INIT #ifndef FF_API_AVCODEC_INIT
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)