ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri
Jul 17 21:21:03 2015 +0200| [e56f14659f580954626e8c1660771c593ecd74fa] |
committer: Michael Niedermayer
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
libx264: Add support for the MPEG2 encoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e56f14659f580954626e8c1660771c593ecd74fa
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
