[FFmpeg-cvslog] Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 21 19:41:40 2015 +0200| [ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf
---