[FFmpeg-cvslog] Merge commit '26589aa81028f42c763c5581a1486a271799890b' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 14 10:59:37 2013 +0200| [3f4fb49d1b14a849cbf5ebcd00bb0dba665b72a8] | committer: Michael Niedermayer

Merge commit '26589aa81028f42c763c5581a1486a271799890b' into release/0.10

* commit '26589aa81028f42c763c5581a1486a271799890b':
  westwood_vqa: do not free extradata on error in read_header
  vqavideo: check the version
  rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
  avio: Handle AVERROR_EOF in the same way as the return value 0

Conflicts:
	libavcodec/vqavideo.c
	libavformat/westwood_vqa.c

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

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