generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/s302m: Only set the sample rate when some data is output

Browse Source 
This way ffplay chooses the mp2 stream for Ticket3890

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-06 00:59:16 +02:00
parent 42c41e96ff
commit 802cca5905
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/s302m.c
View File

@@ -85,7 +85,6 @@ static int s302m_parse_frame_header(AVCodecContext *avctx, const uint8_t *buf,
case 8: case 8:
avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK | AV_CH_LAYOUT_STEREO_DOWNMIX; 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) + avctx->bit_rate = 48000 * avctx->channels * (avctx->bits_per_raw_sample + 4) +
32 * (48000 / (buf_size * 8 / 32 * (48000 / (buf_size * 8 /
(avctx->channels * (avctx->channels *
@@ -197,6 +196,8 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
avctx->sample_rate = 48000;
*got_frame_ptr = 1; *got_frame_ptr = 1;
return avpkt->size; return avpkt->size;