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

avcodec/mpegaudio_parser: treat codec_id like the other parameters

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-11 23:58:39 +01:00
parent d3068d25ca
commit 5669ae8401
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegaudio_parser.c
View File

@@ -64,10 +64,11 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
}else{ }else{
while(i<buf_size){ while(i<buf_size){
int ret, sr, channels, bit_rate, frame_size; int ret, sr, channels, bit_rate, frame_size;
enum AVCodecID codec_id;
state= (state<<8) + buf[i++]; state= (state<<8) + buf[i++];
ret = avpriv_mpa_decode_header(avctx, state, &sr, &channels, &frame_size, &bit_rate); ret = avpriv_mpa_decode_header2(state, &sr, &channels, &frame_size, &bit_rate, &codec_id);
if (ret < 4) { if (ret < 4) {
if (i > 4) if (i > 4)
s->header_count = -2; s->header_count = -2;
@@ -82,6 +83,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
avctx->sample_rate= sr; avctx->sample_rate= sr;
avctx->channels = channels; avctx->channels = channels;
s1->duration = frame_size; s1->duration = frame_size;
avctx->codec_id = codec_id;
if (s->no_bitrate || !avctx->bit_rate) { if (s->no_bitrate || !avctx->bit_rate) {
s->no_bitrate = 1; s->no_bitrate = 1;
avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count; avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count;