Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 17:41:40 +0000 (19:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 18:32:06 +0000 (20:32 +0200)
commitae215e2b42dd172f6bfd9f2dad44c9d5c11884bf
tree14ac07afbbba24d9d557d0e3893bdf3699c31619
parent3bcf61f495dcadbc9679a00e6b1023531288498d
parent6ec688e1bc76dd93151cbca1c340162ae4b10d77
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'

* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegaudiodec_template.c
libavformat/mov.c
tests/fate/mp3.mak