[FFmpeg-cvslog] Merge commit '562bec0e690760fb93deb2843a7237713103a191'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 15:48:50 2017 +0100| [8a403b00d1bd8fdbe6fa545cc91b8a1a315e762b] | committer: Clément Bœsch

Merge commit '562bec0e690760fb93deb2843a7237713103a191'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a403b00d1bd8fdbe6fa545cc91b8a1a315e762b
---

 libavcodec/pnm_parser.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index 43dbfc7..bdd7f2b 100644
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -56,15 +56,6 @@ 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;


======================================================================

diff --cc libavcodec/pnm_parser.c
index 43dbfc7,03d2da9..bdd7f2b
--- a/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);