[FFmpeg-cvslog] avcodec/pnm_parser: Factor next initialization out

Michael Niedermayer git at videolan.org
Thu Apr 11 01:14:36 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Apr  6 14:41:33 2019 +0200| [1d43d72b181afd59f9719c3bc38446f206fc3c6e] | committer: Michael Niedermayer

avcodec/pnm_parser: Factor next initialization out

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/pnm_parser.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index e3bfa3c490..91a9edc016 100644
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -47,6 +47,7 @@ retry:
         pnmctx.bytestream       = (uint8_t *) buf + skip; /* casts avoid warnings */
         pnmctx.bytestream_end   = (uint8_t *) buf + buf_size - skip;
     }
+    next = END_NOT_FOUND;
     if (ff_pnm_decode_header(avctx, &pnmctx) < 0) {
         if (pnmctx.bytestream < pnmctx.bytestream_end) {
             if (pc->index) {
@@ -58,12 +59,10 @@ retry:
             }
             goto retry;
         }
-        next = END_NOT_FOUND;
     } else if (pnmctx.type < 4) {
               uint8_t *bs  = pnmctx.bytestream;
         const uint8_t *end = pnmctx.bytestream_end;
 
-        next = END_NOT_FOUND;
         while (bs < end) {
             int c = *bs++;
             if (c == '#')  {



More information about the ffmpeg-cvslog mailing list