Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 09:55:45 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 09:56:12 +0000 (11:56 +0200)
* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

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

Simple merge