diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 10:58:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 10:58:12 +0100 |
commit | ab9ba8887705e3a1db946e7f992bd5cf411f1f04 (patch) | |
tree | ba182dc06d54cd13990aac6ddeb1c778fde02776 /libswscale/swscale_internal.h | |
parent | 39680caceebfc6abf09b17032048752c014e57a8 (diff) | |
parent | 26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893 (diff) | |
download | ffmpeg-ab9ba8887705e3a1db946e7f992bd5cf411f1f04.tar.gz |
Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893':
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
0 files changed, 0 insertions, 0 deletions