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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 21 12:01:54 2013 +0200| [1d8b1f0e51106c1a24cee565cd29ea469a1d83f8] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: simplify slice component offsets handling

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

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