Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Aug 2011 20:44:58 +0000 (22:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Aug 2011 20:44:58 +0000 (22:44 +0200)
commit878a7d1573d2031173a60efba453c558d826a506
treec57974d271ec05fa6d4d9d933e0950f31027cd5e
parent6a57021cf96dc548b6cc2c97dedb8958225d58e3
parentbd968d260aef322fb32e254a3de0d2036c57bd56
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  cavs: fix some crashes with invalid bitstreams
  jpegdec: actually search for and parse RSTn

Conflicts:
libavcodec/mjpegdec.c

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