diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:14:41 +0100 |
| commit | b71e4d8717450e6d6d08125fbd24a74f082dff71 (patch) | |
| tree | eff948420644b739d148170772592a9e6874c63f /doc | |
| parent | 31c09b7663acdcc64031d6f251a667ce812f590f (diff) | |
| parent | 8941971a8f2e24b9a84fe29f128d13ceb89c0a65 (diff) | |
| download | ffmpeg-b71e4d8717450e6d6d08125fbd24a74f082dff71.tar.gz | |
Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'
* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
lavc: make error_rate a private option of mpegvideo encoders
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 953a38d693..c5668ca273 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-10-xx - xxxxxxx - lavc 55.27.0 - avcodec.h + Deprecate AVCodecContext.error_rate, it is replaced by the 'error_rate' + private option of the mpegvideo encoder family. + 2013-11-xx - xxxxxxx - lavc 55.26.0 - vdpau.h Add av_vdpau_get_profile(). Add av_vdpau_alloc_context(). This function must from now on be |