]> git.sesse.net Git - ffmpeg/commit
Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 09:38:06 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 09:38:06 +0000 (11:38 +0200)
commit567c0dcee6745dc53d67e6de796270449b5753f7
tree43cac939d1979e472eef2e8b522ae0afe8d13c7d
parent6b347f519d5303c56fe21195aeb2a2eb91221061
parent319424d25c53f82b87187ce03ed984d438f1bee6
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>
libavcodec/vdpau.c