summaryrefslogtreecommitdiff
path: root/ffmpeg_vdpau.c
Commit message (Collapse)AuthorAge
* 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>