Michael Niedermayer cdc166acd8 Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' ...

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

Conflicts:
	libavformat/mp3dec.c

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

2014-04-18 00:38:07 +02:00

5.6 KiB

Raw Blame History

View Raw