From 802cca5905abe1fe8392e85a812462b959889aaa Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 6 Jun 2015 00:59:16 +0200
Subject: [PATCH] avcodec/s302m: Only set the sample rate when some data is
output
This way ffplay chooses the mp2 stream for Ticket3890
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/s302m.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c
index daccbaf242e..5cf9eb5b1d8 100644
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@@ -85,7 +85,6 @@ static int s302m_parse_frame_header(AVCodecContext *avctx, const uint8_t *buf,
case 8:
avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK | AV_CH_LAYOUT_STEREO_DOWNMIX;
}
- avctx->sample_rate = 48000;
avctx->bit_rate = 48000 * avctx->channels * (avctx->bits_per_raw_sample + 4) +
32 * (48000 / (buf_size * 8 /
(avctx->channels *
@@ -197,6 +196,8 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
}
}
+ avctx->sample_rate = 48000;
+
*got_frame_ptr = 1;
return avpkt->size;
--
GitLab