ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Feb 19
20:52:29 2015 +0100| [841e9f431cf4b1be0b5c3932c289d405f34dfcc2] | committer:
Michael Niedermayer
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=841e9f431cf4b1be0b5c3932c289d405f34dfcc2
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
