diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:47:27 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:47:27 +0100 |
commit | 1e96b151fa6e9931c626283b7dfc15e4ec0095aa (patch) | |
tree | d446814f822f9a3125c1b60414e1f9c68b6bdb64 /libavcodec/mpegaudiodecheader.c | |
parent | 15c60c8af2271cd7d5c6c6ce7f8f127a32f18cfd (diff) | |
parent | 955aec3c7c7be39b659197e1ec379a09f2b7c41c (diff) |
Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'
* commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c':
mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpegaudiodecheader.c')
-rw-r--r-- | libavcodec/mpegaudiodecheader.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index d522c064ac..30033fb2a2 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -37,6 +37,12 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header) { int sample_rate, frame_size, mpeg25, padding; int sample_rate_index, bitrate_index; + int ret; + + ret = ff_mpa_check_header(header); + if (ret < 0) + return ret; + if (header & (1<<20)) { s->lsf = (header & (1<<19)) ? 0 : 1; mpeg25 = 0; @@ -117,9 +123,6 @@ int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, in { MPADecodeHeader s1, *s = &s1; - if (ff_mpa_check_header(head) != 0) - return -1; - if (avpriv_mpegaudio_decode_header(s, head) != 0) { return -1; } |