[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 25 01:19:09 2011 +0200| [14d5e214bfb56f08b1d34d13758c1e56a59c8c99] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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