[FFmpeg-cvslog] Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 17 23:51:45 2014 +0200| [cdc166acd80bf7de7338ac95b3f283dd531a9a06] | committer: Michael Niedermayer

Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'

* commit '32d05934abc7427bb90380a4c1ab20a15fd7d821':
  mp3dec: decode more data from Info header

Conflicts:
	libavformat/mp3dec.c

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

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