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

Conflicts:
	libavcodec/pnm.c
	libavcodec/pnmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>