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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 18 12:37:42 2013 +0100| [b8f8f7c7fe37222e2569d73b80ba57982a069451] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png_parser: Fix parsing on big endian

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

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