[FFmpeg-cvslog] Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
Michael Niedermayer
git at videolan.org
Fri Jul 17 21:31:03 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | 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 <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e56f14659f580954626e8c1660771c593ecd74fa
---
More information about the ffmpeg-cvslog
mailing list