diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
commit | e77b9853ea66ef6c34b04d121c5b3d1afaa33971 (patch) | |
tree | d29ef557ca9f706269711b2a31663d956f237996 /doc | |
parent | e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (diff) | |
parent | a2941c8cb216bdc144953cace64973f5600ffa2d (diff) | |
download | ffmpeg-e77b9853ea66ef6c34b04d121c5b3d1afaa33971.tar.gz |
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
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 bbb1331e6f..7e3c592d75 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-04-xx - xxxxxxx - lavc 55.50.3 - avcodec.h + Deprecate CODEC_FLAG_MV0. It is replaced by the flag "mv0" in the + "mpv_flags" private option of the mpegvideo encoders. + 2014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the libxvid encoder. |