Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:14:28 +0000 (14:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:14:28 +0000 (14:14 +0100)
commit198ea7a96f64b60d26068ac30605d5b50245abeb
treef3733ea0f10027eebe49df94826e46e52e907b3d
parenta77a27a24b27fc29d119b00866740e4d0b69ba28
parentb5f536d24b5ae360503935c34d5d59fa5181b94d
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@gmx.at>
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c