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

lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Dustin Brody 2011-07-29 03:25:34 -04:00 committed by Ronald S. Bultje
parent 1442d29533
commit 18cb40f074
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ffmpeg.texi
View File

@ -469,8 +469,6 @@ FF_ER_COMPLIANT
@item 3 @item 3
FF_ER_AGGRESSIVE FF_ER_AGGRESSIVE
@item 4 @item 4
FF_ER_VERY_AGGRESSIVE
@item 5
FF_ER_EXPLODE FF_ER_EXPLODE
@end table @end table

4
libavcodec/avcodec.h
View File

@ -1445,8 +1445,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
#define FF_ER_VERY_AGGRESSIVE 4 #define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5 #define FF_ER_EXPLODE 5
#else
#define FF_ER_EXPLODE 4
#endif /* FF_API_VERY_AGGRESSIVE */
/** /**
* 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.

2
libavcodec/options.c
View File

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

3
libavcodec/version.h
View File

@ -77,5 +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
#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */