diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 14:03:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 14:11:03 +0100 |
| commit | 9f32048dd1967d7aa5421c490349a1056849cd78 (patch) | |
| tree | 7147e237551224b8f7477096d2cf7e1f000d31ef /libavcodec/avcodec.h | |
| parent | dbfa4317f3f8df13d889732d62f8d6abef2ac620 (diff) | |
| parent | aa241229891173b0357eee04e6ca78f806cc9c0c (diff) | |
| download | ffmpeg-9f32048dd1967d7aa5421c490349a1056849cd78.tar.gz | |
Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'
* commit 'aa241229891173b0357eee04e6ca78f806cc9c0c':
lavc: deprecate FF_MAX_B_FRAMES
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 084f2ae1b4..18a41256d8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -691,7 +691,12 @@ typedef struct RcOverride{ float quality_factor; } RcOverride; +#if FF_API_MAX_BFRAMES +/** + * @deprecated there is no libavcodec-wide limit on the number of B-frames + */ #define FF_MAX_B_FRAMES 16 +#endif /* encoding support These flags can be passed in AVCodecContext.flags before initialization. |