[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  2 00:52:23 2012 +0200| [976d173606769e09442d1ab2ca1436ffd96a35be] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  id3v2: fix skipping extended header in id3v2.4

Conflicts:
	libavformat/id3v2.c

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

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