Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:48:23 +0000 (00:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:48:23 +0000 (00:48 +0100)
commitc09eeca5468ca03cc5733f08dc6303b4aef2c2c1
tree4cb9bc74bdd24febb33f737eb4d8206f0c6f803a
parentcb03d29dec649efb03b895810f610e61d70800ca
parent8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'

* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
Changelog
configure
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libopenh264enc.c
libavcodec/version.h