[FFmpeg-cvslog] Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'
Michael Niedermayer
git at videolan.org
Mon May 12 02:32:18 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 01:57:02 2014 +0200| [5449239a031e657cfe364521d2b6d58c0ef0e7f0] | committer: Michael Niedermayer
Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'
* commit '67afcefb35932b420998f6f3fda46c7c85848a3f':
lavc: Add new VDA hwaccel
Conflicts:
configure
libavcodec/vda.h
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5449239a031e657cfe364521d2b6d58c0ef0e7f0
---
More information about the ffmpeg-cvslog
mailing list