Merge commit '562bec0e690760fb93deb2843a7237713103a191'

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

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

diff --cc libavcodec/pnm_parser.c
index 43dbfc7f27e07ccb6bb936cf75be32e67407dad7,03d2da9f96943b935951444503f35b04431d3dc8..bdd7f2b50599956a7a8b9c141ba9ff9722f0bf3a
--- 1/libavcodec/pnm_parser.c
--- 2/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@@ -56,18 -56,7 +56,9 @@@ retry
              }
              goto retry;
          }
- #if 0
-         if (pc->index && pc->index * 2 + AV_INPUT_BUFFER_PADDING_SIZE < pc->buffer_size && buf_size > pc->index) {
-             memcpy(pc->buffer + pc->index, buf, pc->index);
-             pc->index += pc->index;
-             buf       += pc->index;
-             buf_size  -= pc->index;
-             goto retry;
-         }
- #endif
          next = END_NOT_FOUND;
 +    } else if (pnmctx.type < 4) {
 +        next = END_NOT_FOUND;
      } else {
          next = pnmctx.bytestream - pnmctx.bytestream_start
                 + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);