Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 10:31:19 +0000 (11:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 10:31:29 +0000 (11:31 +0100)
* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libopenh264enc.c

Simple merge