Merge commit '99143140dea12363af680d02e23cb42cfe191679'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:49:53 +0000 (12:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:49:53 +0000 (12:49 +0200)
commit899d3706d8fde29b78d0a72f92cfcd8be6aab419
treedb59a9fd83b3937b41678643f7a27382549a4b7a
parent2c5ae57776907142b78243cbf502be6f5370ca87
parent99143140dea12363af680d02e23cb42cfe191679
Merge commit '99143140dea12363af680d02e23cb42cfe191679'

* commit '99143140dea12363af680d02e23cb42cfe191679':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mp3dec.c