aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input/ffmpeg')
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 743b9456a..e5f7ee324 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -246,7 +246,10 @@ bool DecoderFFmpeg::initialize()
else
configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE);
#endif
- m_bitrate = c->bit_rate;
+ if(ic->bit_rate)
+ m_bitrate = ic->bit_rate;
+ if(c->bit_rate)
+ m_bitrate = c->bit_rate;
qDebug("DecoderFFmpeg: initialize succes");
return true;
}
@@ -293,7 +296,8 @@ qint64 DecoderFFmpeg::ffmpeg_decode(uint8_t *audio)
#else
int l = avcodec_decode_audio2(c, (int16_t *)(audio), &out_size, m_temp_pkt.data, m_temp_pkt.size);
#endif
- m_bitrate = c->bit_rate/1024;
+ if(c->bit_rate)
+ m_bitrate = c->bit_rate/1000;
if(l < 0)
return l;
m_temp_pkt.data += l;