[FFmpeg-cvslog] Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:10:43 2015 +0100| [275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f] | committer: Michael Niedermayer

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 at gmx.at>

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