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

[Michael Niedermayer]

ffmpeg | branch: release/0.5 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  2 02:25:43 2012 +0200| [0fda37cff9470c602fd59366ac4250a9a4eae6b1] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

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

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

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