ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Mar 28 
01:33:27 2015 +0100| [0a731e45964cda0606fc04128f41353d8282f091] | committer: 
Michael Niedermayer

Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'

* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
        Changelog
        libavcodec/version.h

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a731e45964cda0606fc04128f41353d8282f091
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to