[FFmpeg-cvslog] Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
Michael Niedermayer
git at videolan.org
Mon May 12 03:06:10 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 02:34:01 2014 +0200| [5460ab73d2e8169c54beda06e7cca762aee84a1f] | committer: Michael Niedermayer
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5460ab73d2e8169c54beda06e7cca762aee84a1f
---
More information about the ffmpeg-cvslog
mailing list