Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid Conflicts: libavcodec/libxvid.c libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit e40ae8c2 parents 1851643 64841495 files · +23 −2Browse files

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

Unified · Split

doc/APIchanges+4−0

@@ -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.2 - avcodec.h
		19	Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the
		20	libxvid encoder.
		21
18	2014-04-xx - xxxxxxx - lavc 55.50.1 - avcodec.h	22	2014-04-xx - xxxxxxx - lavc 55.50.1 - avcodec.h
19	Deprecate CODEC_FLAG_NORMALIZE_AQP. It is replaced by the flag "naq" in the	23	Deprecate CODEC_FLAG_NORMALIZE_AQP. It is replaced by the flag "naq" in the
20	"mpv_flags" private option of the mpegvideo encoders.	24	"mpv_flags" private option of the mpegvideo encoders.

Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code