[FFmpeg-cvslog] Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 14:14:28 2013 +0100| [198ea7a96f64b60d26068ac30605d5b50245abeb] | committer: Michael Niedermayer

Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'

* commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d':
  pnm: add high-bitdepth PGMYUV support for both encoder and decoder

Conflicts:
	libavcodec/pnm.c
	libavcodec/pnmdec.c

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

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