Merge commit '26589aa81028f42c763c5581a1486a271799890b' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 08:59:37 +0000 (10:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 08:59:37 +0000 (10:59 +0200)
commit3f4fb49d1b14a849cbf5ebcd00bb0dba665b72a8
treece88e10c7adbdb3327e1a5bddce4155f19ffab50
parentd06dda65b499458761d23d9580fdcaa451ba96f5
parent26589aa81028f42c763c5581a1486a271799890b
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@gmx.at>
libavcodec/vqavideo.c
libavformat/avio.c
libavformat/westwood_vqa.c