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)
commit39becc949c04033e3377e7f5f7dbecbbb0824b23
treefd9d2e079b0cf2709f46a7c033bf4ed66fed7357
parentdbd6ba24a870c65dcd8fd3e4bfe5a311cebd71cd
parent25c29d32835f38cdc5f0c84fa27dfc489a228770
Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

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