summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 16:56:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 16:56:40 +0200
commite40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (patch)
tree4d1174389c3fc1fb3d8e1dafd0e6b7ba6fc4655f /doc
parent185164398763b76729d6169bea35d08c48d1d32f (diff)
parent6484149158b6fc6d13d2b2ef84cb26a2d3275400 (diff)
downloadffmpeg-streaming-e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631.zip
ffmpeg-streaming-e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631.tar.gz
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid Conflicts: libavcodec/libxvid.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/APIchanges4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index e4586ff..bbb1331 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.2 - avcodec.h
+ Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the
+ libxvid encoder.
+
2014-04-xx - xxxxxxx - lavc 55.50.1 - avcodec.h
Deprecate CODEC_FLAG_NORMALIZE_AQP. It is replaced by the flag "naq" in the
"mpv_flags" private option of the mpegvideo encoders.
OpenPOWER on IntegriCloud