From 696733d077f51b09eda43062286f82103763f57d Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Tue, 27 May 2014 16:45:53 +0200 Subject: [PATCH] ad_lavc: don't overwrite lavc bitrate If the bitrate is already known in avcodec there is no need to overwrite it again with the value from sh_audio. --- audio/decode/ad_lavc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index a55a5966ae..fff3a92380 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -270,8 +270,9 @@ static int init(struct dec_audio *da, const char *decoder) } } - da->bitrate = lavc_context->bit_rate; - if (sh_audio->wf && sh_audio->wf->nAvgBytesPerSec) + if (lavc_context->bit_rate != 0) + da->bitrate = lavc_context->bit_rate; + else if (sh_audio->wf && sh_audio->wf->nAvgBytesPerSec) da->bitrate = sh_audio->wf->nAvgBytesPerSec * 8; return 1;