Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:15:17 +0000 (21:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:15:25 +0000 (21:15 +0100)
* commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e':
  libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header

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

Simple merge