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)
commit2bac839bd3c3d0865199f4e7cc478afdb10b66c6
treec06faed687af6b2e7080fa49c06137b3e219a835
parentd12bc01ec55a78b33ab9bef8377ae6adff03354a
parentf13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7
Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'

* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

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