diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
| commit | 335bbe424f6d21b5540230db8dadd4f42751d260 (patch) | |
| tree | db80afbc0ca61d9705fd8a30a49f9599c4b09a28 /libavcodec | |
| parent | b39f872a41b92a31589052c8f914c5b52f206fd0 (diff) | |
| parent | 18cb40f074ec7e79b20bf9b8c8f19c55784a071c (diff) | |
| download | ffmpeg-335bbe424f6d21b5540230db8dadd4f42751d260.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
x11grab: add show_region AVOption.
x11grab: add follow_mouse AVOption.
Do not convert RGB buffer at once when stride does not fit exact samples.
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1dec91a460..0bb86690bc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1492,8 +1492,12 @@ typedef struct AVCodecContext { #define FF_ER_CAREFUL 1 #define FF_ER_COMPLIANT 2 #define FF_ER_AGGRESSIVE 3 +#if FF_API_VERY_AGGRESSIVE #define FF_ER_VERY_AGGRESSIVE 4 #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. diff --git a/libavcodec/options.c b/libavcodec/options.c index 2ecb5877c4..d201072874 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -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"}, {"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"}, +#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"}, +#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"}, {"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}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 1883768a29..69040a5195 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -77,5 +77,8 @@ #ifndef FF_API_DRC_SCALE #define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_VERY_AGGRESSIVE +#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54) +#endif #endif /* AVCODEC_VERSION_H */ |