[FFmpeg-cvslog] avcodec/exr: set layer_match in all branches

Michael Niedermayer git at videolan.org
Thu Mar 28 18:33:30 EET 2019


ffmpeg | branch: release/3.4 | Michael Niedermayer <michael at niedermayer.cc> | Tue Dec 25 21:30:54 2018 +0100| [980ad512910a21d09c488968b402e2f35e94a22e] | committer: Michael Niedermayer

avcodec/exr: set layer_match in all branches

Otherwise it is left to the value from the previous iteration

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 433d2ae4353f3c513a45780845d9d8ca252cd4dc)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/exr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index e7a6146f0e..5aa75ab112 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1387,6 +1387,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
                         if (*ch_gb.buffer == '.')
                             ch_gb.buffer++;         /* skip dot if not given */
                     } else {
+                        layer_match = 0;
                         av_log(s->avctx, AV_LOG_INFO,
                                "Channel doesn't match layer : %s.\n", ch_gb.buffer);
                     }



More information about the ffmpeg-cvslog mailing list