diff options
Diffstat (limited to 'libavcodec/mpegaudiodecheader.c')
| -rw-r--r-- | libavcodec/mpegaudiodecheader.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index a315965a17..ae86b087f3 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -2,20 +2,20 @@ * MPEG Audio header decoder * Copyright (c) 2001, 2002 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -119,8 +119,7 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header) return 0; } -int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, - int *channels, int *frame_size, int *bit_rate) +int ff_mpa_decode_header(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate, enum AVCodecID *codec_id) { MPADecodeHeader s1, *s = &s1; @@ -130,17 +129,17 @@ int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, switch(s->layer) { case 1: - avctx->codec_id = AV_CODEC_ID_MP1; + *codec_id = AV_CODEC_ID_MP1; *frame_size = 384; break; case 2: - avctx->codec_id = AV_CODEC_ID_MP2; + *codec_id = AV_CODEC_ID_MP2; *frame_size = 1152; break; default: case 3: - if (avctx->codec_id != AV_CODEC_ID_MP3ADU) - avctx->codec_id = AV_CODEC_ID_MP3; + if (*codec_id != AV_CODEC_ID_MP3ADU) + *codec_id = AV_CODEC_ID_MP3; if (s->lsf) *frame_size = 576; else @@ -154,9 +153,14 @@ int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, return s->frame_size; } -#if LIBAVCODEC_VERSION_MAJOR < 57 +#if LIBAVCODEC_VERSION_MAJOR < 58 +int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate, enum AVCodecID *codec_id) +{ + return ff_mpa_decode_header(head, sample_rate, channels, frame_size, bit_rate, codec_id); +} + int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate) { - return ff_mpa_decode_header(avctx, head, sample_rate, channels, frame_size, bit_rate); + return ff_mpa_decode_header(head, sample_rate, channels, frame_size, bit_rate, &avctx->codec_id); } #endif |