diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:43:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:46:48 +0100 |
| commit | 3e641b4842b8b5f6592991479d19f1a7ce846308 (patch) | |
| tree | 25bee33d11ceddf0ee1758dd8cf5763764d5fc80 /libswscale | |
| parent | 62e10c375968d9cbbe2a0bc321e00eef52d32917 (diff) | |
| parent | 7671dd7cd7d51bbd637cc46d8f104a141bc355ea (diff) | |
| download | ffmpeg-3e641b4842b8b5f6592991479d19f1a7ce846308.tar.gz | |
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions