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)
* commit '440119b18836887d98c9e337c5911563bb43588c':
  libopenh264enc: Move a declaration of a variable into an ifdef

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

Simple merge