summaryrefslogtreecommitdiff
path: root/ffmpeg_vdpau.c
Commit message (Collapse)AuthorAge
* Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'Michael Niedermayer2014-12-27
| | | | | | | * commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec': avconv_vdpau: allocate video surface of VDPAU-specified size Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'Michael Niedermayer2014-10-06
| | | | | | | * commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd': avconv_vdpau: update to new VDPAU interface Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add vdpau_old to allow continued testing of the older (but not ↵Michael Niedermayer2014-10-06
| | | | | | oldest) API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-23
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>