diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-14 13:00:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-14 13:00:10 +0100 |
| commit | 5f231d909f158e40d20281b88e7aecc2333057fe (patch) | |
| tree | 4a7a02aad0bc1d864181b156306dfb3c2aed0f32 /libavformat | |
| parent | f3458a56c117674bf6003b59250c79a13308c05f (diff) | |
| parent | ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions