Files
ffmpeg/libavformat
Michael Niedermayer 3f4fb49d1b 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>
2013-09-14 10:59:37 +02:00
..
2011-12-12 20:21:47 +01:00
2012-01-16 03:43:32 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2012-06-09 20:46:03 +02:00
2011-08-09 19:56:25 +02:00
2011-12-30 20:00:53 +01:00
2011-11-03 20:21:01 +01:00
2011-12-29 15:25:07 +01:00
2011-12-30 20:00:53 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2013-04-24 21:01:14 +02:00
2011-12-18 16:23:16 +01:00
2012-01-09 11:02:21 +01:00
2011-12-18 23:54:56 +01:00
2012-01-16 11:29:55 +01:00
2011-12-19 19:11:49 +01:00
2012-09-13 09:21:55 +02:00
2011-12-16 06:02:14 +01:00
2012-01-07 09:59:15 -05:00
2012-01-14 17:14:18 +01:00
2011-12-30 20:00:53 +01:00