diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
commit | 4917fecf4a005918d4f32b95683f392f0fae0b51 (patch) | |
tree | ab2c05a687113f409b7c655fa7b9670d37b8d1eb /doc/APIchanges | |
parent | a561662fb7223cb98907744e03398848a0d362e1 (diff) | |
parent | bb789016d423d2cfacd2904ac66257bdf7f0964e (diff) | |
download | ffmpeg-4917fecf4a005918d4f32b95683f392f0fae0b51.tar.gz |
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 606f9fffff..35de557672 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h + sws_getCachedContext is not going to be removed in the future. + 2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h reordered_opaque is not going to be removed in the future. |