[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

[Michael Niedermayer]

ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 21 22:44:58 2011 +0200| [878a7d1573d2031173a60efba453c558d826a506] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=878a7d1573d2031173a60efba453c558d826a506
---