ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Oct 6
11:38:06 2014 +0200| [567c0dcee6745dc53d67e6de796270449b5753f7] | committer:
Michael Niedermayer
Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6'
* commit '319424d25c53f82b87187ce03ed984d438f1bee6':
vdpau: add helper for VDPAU to libav error codes conversion
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=567c0dcee6745dc53d67e6de796270449b5753f7
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
