Merge commit '440119b18836887d98c9e337c5911563bb43588c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:29:19 +0000 (21:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:55:23 +0000 (21:55 +0100)
commit6c9dfa5a1b45a02e85c308e53bd39cd4a32826df
tree2f1c48f927467eebb0d466b9e098ab383ed3819e
parent87c4a80e563ae19fec482aaac635d48c16d5c114
parent440119b18836887d98c9e337c5911563bb43588c
Merge commit '440119b18836887d98c9e337c5911563bb43588c'

* commit '440119b18836887d98c9e337c5911563bb43588c':
  libopenh264enc: Move a declaration of a variable into an ifdef

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