diff options
author | Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> | 2015-02-13 22:51:33 +0100 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2015-02-21 23:37:42 +0200 |
commit | 5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a (patch) | |
tree | ff6b7712c530ca61f4e64ba783fe85f97a034465 /libavcodec/mpegaudiodecheader.c | |
parent | 5e5583efe41662294c5e1b76499ba338557f808d (diff) | |
download | ffmpeg-5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a.tar.gz |
mpegaudio_parser: add MP3 ADU headers parser
Signed-off-by: Martin Storsjö <martin@martin.st>
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 25e73195b8..8efcbe4dab 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -134,7 +134,8 @@ int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_r break; default: case 3: - avctx->codec_id = AV_CODEC_ID_MP3; + if (avctx->codec_id != AV_CODEC_ID_MP3ADU) + avctx->codec_id = AV_CODEC_ID_MP3; if (s->lsf) *frame_size = 576; else |