a6ab9ed50d
Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'
...
* commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec':
avconv_vdpau: allocate video surface of VDPAU-specified size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 13:26:38 +01:00
4d8356b678
Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'
...
* commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd':
avconv_vdpau: update to new VDPAU interface
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 16:31:51 +02:00
403133ab5e
ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 16:09:02 +02:00
3e641b4842
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
...
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Michael Niedermayer