Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:21:03 +0000 (21:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:21:03 +0000 (21:21 +0200)
commite56f14659f580954626e8c1660771c593ecd74fa
treec2c0eeb1f93092778165d4812316df3df2d65ff8
parent4c7c0d37e5c2ad5b046d1f543e47850c8b94403d
parente1319aa1c1be9b64117c19170344fb78841dd67c
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'

* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
  libx264: Add support for the MPEG2 encoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libx264.c