[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  4 14:30:41 2013 +0200| [7ad359b3949cc333697f722c050ff4d4a73276ae] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()

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

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