diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
commit | 5f231d909f158e40d20281b88e7aecc2333057fe (patch) | |
tree | 4a7a02aad0bc1d864181b156306dfb3c2aed0f32 /doc/APIchanges | |
parent | f3458a56c117674bf6003b59250c79a13308c05f (diff) | |
parent | ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118 (diff) | |
download | ffmpeg-5f231d909f158e40d20281b88e7aecc2333057fe.tar.gz |
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
vdpau: add a convenience function for getting a decoder profile.
Conflicts:
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/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 dfdc159308..3a5e5b646d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-11-xx - xxxxxxx - lavc 55.26.0 - vdpau.h + Add av_vdpau_get_profile(). + 2013-11-xx - xxxxxxx - lavc 55.41.100 / 55.25.0 - avcodec.h lavu 52.51.100 - frame.h Add ITU-R BT.2020 and other not yet included values to color primaries, |