Merge commit '562bec0e690760fb93deb2843a7237713103a191'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:48:50 +0000 (15:48 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:48:50 +0000 (15:48 +0100)
commit8a403b00d1bd8fdbe6fa545cc91b8a1a315e762b
treeaee0c34672cde0e2488a42ce828ebbf649e5e1cd
parent18cdef9ab7d713e4320318c6fd733f3ba958864f
parent562bec0e690760fb93deb2843a7237713103a191
Merge commit '562bec0e690760fb93deb2843a7237713103a191'

* commit '562bec0e690760fb93deb2843a7237713103a191':
  pnm_parser: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/pnm_parser.c