Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:10:43 +0000 (01:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:10:56 +0000 (01:10 +0100)
commit275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f
treeaa28cbcc2baf994eebec10cdbf572d59cb1736b3
parent749fadaa651e21540f3c86561be9be9f098ddb44
parent556a5090f2b0a20fd9998e1a327875f5b0c8d1d5
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

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