Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Jul 2011 23:19:09 +0000 (01:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Jul 2011 23:19:40 +0000 (01:19 +0200)
commit14d5e214bfb56f08b1d34d13758c1e56a59c8c99
tree32ebdb64e86373a84a8fedc29ab535c452011a57
parent88084eecdfd163802a47501935408acbe07b1691
parent8c0fa61a9713a1306fca7997dd04d72ea1f060ea
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  jpegdec: actually search for and parse RSTn

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