[FFmpeg-devel] [PATCH] avcodec/g723_1_parser: keep avctx channels internally if value is > 0

[Paul B Mahol]

Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavcodec/g723_1_parser.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/g723_1_parser.c b/libavcodec/g723_1_parser.c
index 2ed1a8ab19..03c165ce55 100644
--- a/libavcodec/g723_1_parser.c
+++ b/libavcodec/g723_1_parser.c
@@ -26,6 +26,7 @@
 
 typedef struct G723_1ParseContext {
     ParseContext pc;
+    int channels;
 } G723_1ParseContext;
 
 static int g723_1_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
@@ -36,8 +37,11 @@ static int g723_1_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
     ParseContext *pc = &s->pc;
     int next = END_NOT_FOUND;
 
+    if (avctx->ch_layout.nb_channels > 0)
+        s->channels = avctx->ch_layout.nb_channels;
+
     if (buf_size > 0)
-        next = frame_size[buf[0] & 3] * FFMAX(1, avctx->ch_layout.nb_channels);
+        next = frame_size[buf[0] & 3] * FFMAX(1, s->channels);
 
     if (ff_combine_frame(pc, next, &buf, &buf_size) < 0 || !buf_size) {
         *poutbuf      = NULL;
-- 
2.35.1