[FFmpeg-cvslog] Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 22 01:08:03 2015 +0100| [dedbefee60430e04551977553838e89dad4ff932] | committer: Michael Niedermayer

Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'

* commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a':
  mpegaudio_parser: add MP3 ADU headers parser

Conflicts:
	libavcodec/mpegaudio_parser.c
	libavcodec/mpegaudiodecheader.c
	libavcodec/version.h

See: 8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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