Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:08:03 +0000 (01:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:08:28 +0000 (01:08 +0100)
commitdedbefee60430e04551977553838e89dad4ff932
treeb3e8f39ade076809a59ef7568a375731045ba4f3
parentfee2cc39becb1930461dff267389717337804a4a
parent5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a
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@gmx.at>
libavcodec/mpegaudio_parser.c
libavcodec/version.h