Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 21:51:45 +0000 (23:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 22:38:07 +0000 (00:38 +0200)
commitcdc166acd80bf7de7338ac95b3f283dd531a9a06
treed818820e0e2fb920e510ac6a92ff4f46a248468e
parenta8d01a73789260533778371e38e733d047316d83
parent32d05934abc7427bb90380a4c1ab20a15fd7d821
Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'

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

Conflicts:
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/mp3dec.c