Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d': lavc: move CODEC_FLAG_MV0 to mpegvideo Conflicts: libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit e77b9852 parents e40ae8c a2941c88 files · +31 −5Browse files

Showing the changes to doc/APIchanges (1 of 8 files). Show all

Unified · Split

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-04-xx - xxxxxxx - lavc 55.50.3 - avcodec.h
		19	Deprecate CODEC_FLAG_MV0. It is replaced by the flag "mv0" in the
		20	"mpv_flags" private option of the mpegvideo encoders.
		21
18	2014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h	22	2014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h
19	Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the	23	Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the
20	libxvid encoder.	24	libxvid encoder.

Keyboard shortcuts