diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 11:38:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 11:38:06 +0200 |
| commit | 567c0dcee6745dc53d67e6de796270449b5753f7 (patch) | |
| tree | 43cac939d1979e472eef2e8b522ae0afe8d13c7d /libavcodec/adxenc.c | |
| parent | 6b347f519d5303c56fe21195aeb2a2eb91221061 (diff) | |
| parent | 319424d25c53f82b87187ce03ed984d438f1bee6 (diff) | |
| download | ffmpeg-567c0dcee6745dc53d67e6de796270449b5753f7.tar.gz | |
Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6'
* commit '319424d25c53f82b87187ce03ed984d438f1bee6':
vdpau: add helper for VDPAU to libav error codes conversion
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adxenc.c')
0 files changed, 0 insertions, 0 deletions