Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
  avcodec: Rename xvidmmx IDCT to xvid

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-09 12:11:13 +02:00
6 changed files with 17 additions and 4 deletions
+4
View File
@@ -15,6 +15,10 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-08-xx - xxxxxxx - lavc 55.57.4 - avcodec.h
Deprecate FF_IDCT_XVIDMMX define and xvidmmx idct option.
Replaced by FF_IDCT_XVID and xvid respectively.
2014-08-xx - xxxxxxx - lavf 55.53.100 - avio.h
Add avio_feof() and deprecate url_feof().