summaryrefslogtreecommitdiffstats
path: root/libavcodec/vdpau_mpeg12.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'Michael Niedermayer2013-01-141-4/+4
| | | | | | | | | | | | | * commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b': vdpau: Add MPEG-4 decoding via hwaccel infrastructure vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* vdpau: Add MPEG-1/2 decoding via hwaccel infrastructureRĂ©mi Denis-Courmont2013-01-131-0/+116
Signed-off-by: Diego Biurrun <diego@biurrun.de>
OpenPOWER on IntegriCloud