ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Jul 9
11:17:12 2015 +0200| [96ee6b9962ec0479deddedd64a46aef4846d90ba] | committer:
Michael Niedermayer
Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
lavc: add Intel libmfx-based MPEG2 encoder
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96ee6b9962ec0479deddedd64a46aef4846d90ba
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
