Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36': avcodec: Rename xvidmmx IDCT to xvid Conflicts: doc/APIchanges libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit 3841f2a2 parents 64d029d d35b94f6 files · +17 −4Browse files

Showing the changes to doc/APIchanges (1 of 6 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-08-xx - xxxxxxx - lavc 55.57.4 - avcodec.h
		19	Deprecate FF_IDCT_XVIDMMX define and xvidmmx idct option.
		20	Replaced by FF_IDCT_XVID and xvid respectively.
		21
18	2014-08-xx - xxxxxxx - lavf 55.53.100 - avio.h	22	2014-08-xx - xxxxxxx - lavf 55.53.100 - avio.h
19	Add avio_feof() and deprecate url_feof().	23	Add avio_feof() and deprecate url_feof().
20		24

Keyboard shortcuts