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)
* commit '562bec0e690760fb93deb2843a7237713103a191':
  pnm_parser: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
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);