Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:00:55 +0000 (14:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:01:41 +0000 (14:01 +0100)
* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

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

Simple merge