diff options
author | Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> | 2015-02-13 22:51:33 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 19:32:42 +0100 |
commit | 8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce (patch) | |
tree | 34afa9f2561cc4a7534ddc2bd66be18ad0ffded7 /libavcodec/mpegaudiodecheader.c | |
parent | b533949813cc8eaa2eb68142b0fa384c231ab6c9 (diff) | |
download | ffmpeg-8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce.tar.gz |
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodecheader.c')
-rw-r--r-- | libavcodec/mpegaudiodecheader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 5db195725f..6af6e4b239 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -134,7 +134,8 @@ int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, in break; default: case 3: - *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 |