diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 23:58:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 00:10:35 +0100 |
| commit | 5669ae84016f766a7632de29f014294f140513cb (patch) | |
| tree | 585f832eb082ddb6a5aeaf9398c072d479b5e038 /libavcodec/mpegaudio_parser.c | |
| parent | d3068d25ca6d07e0a4ec51080e128329df660640 (diff) | |
avcodec/mpegaudio_parser: treat codec_id like the other parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudio_parser.c')
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 408193671f..7a6411ca63 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -64,10 +64,11 @@ static int mpegaudio_parse(AVCodecParserContext *s1, }else{ while(i<buf_size){ int ret, sr, channels, bit_rate, frame_size; + enum AVCodecID codec_id; 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 (i > 4) s->header_count = -2; @@ -82,6 +83,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, avctx->sample_rate= sr; avctx->channels = channels; s1->duration = frame_size; + avctx->codec_id = codec_id; if (s->no_bitrate || !avctx->bit_rate) { s->no_bitrate = 1; avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count; |