diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
| commit | 3841f2ae665d527a7c8b3c226925995256adb917 (patch) | |
| tree | 62a2f32ee938ff94386dfe6d5771d1d05d40f165 /doc | |
| parent | 64d029de41ed556b765df50c7080b06fd5a86417 (diff) | |
| parent | d35b94fbabd8beb5d566c0b5d01688aff62c3b36 (diff) | |
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
avcodec: Rename xvidmmx IDCT to xvid
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 9bcd91614c..024ba3a4a8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -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(). |