Michael Niedermayer 333e708520 Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9: (21 commits)
  ogg: Fix potential infinite discard loop
  dxa: Make sure the reference frame exists
  h261: check the mtype index
  segafilm: Error out on impossible packet size
  ogg: Always alloc the private context in vorbis_header
  rtjpeg: Use init_get_bits8
  nuv: Reset the frame on resize
  nuv: Use av_fast_realloc
  nuv: return meaningful error codes.
  nuv: Pad the lzo outbuf
  nuv: Do not ignore lzo decompression failures
  rtmp: Do not misuse memcmp
  rtmp: rename data_size to size
  vc1: check mb_height validity.
  vc1: check the source buffer in vc1_mc functions
  bink: Bound check the quantization matrix.
  aac: Check init_get_bits return value
  aac: return meaningful errors
  aac: K&R formatting cosmetics
  oma: correctly mark and decrypt partial packets
  ...

Conflicts:
	libavcodec/aacdec.c
	libavcodec/h261dec.c
	libavcodec/nuv.c
	libavcodec/vc1dec.c
	libavformat/oggparsevorbis.c
	libavformat/omadec.c
	libavformat/rtmpproto.c
	tests/ref/fate/nuv-rtjpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-27 19:13:15 +02:00
..
2012-02-26 07:48:45 +01:00
2013-02-07 07:18:56 +01:00
2012-11-29 13:24:48 +00:00
2012-11-23 17:30:05 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-09-02 18:15:08 +02:00
ast
2012-11-23 17:30:05 +00:00
2012-10-12 20:56:54 +02:00
2011-06-30 09:47:32 +01:00
2010-03-15 19:23:24 +00:00
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-12-11 11:34:47 +00:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-08-25 16:46:50 -04:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2010-03-15 19:23:24 +00:00
2012-02-26 07:48:45 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-05 00:01:17 +01:00
2012-03-02 18:58:19 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-10 12:18:38 +01:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2010-03-15 19:23:24 +00:00
2011-07-04 16:26:26 +01:00
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-11-07 01:51:24 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-10-08 09:06:25 +00:00
2010-03-15 19:23:24 +00:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2011-07-03 18:19:18 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-11-16 14:12:37 +01:00
2012-11-05 02:20:52 +01:00
2010-03-15 19:23:24 +00:00
2012-08-03 15:18:12 +00:00
2012-07-10 00:04:23 +00:00
2012-05-14 12:50:01 +01:00
2012-11-06 16:18:30 +00:00
ptx
2012-07-17 17:06:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-06-22 00:16:03 +00:00
sha
2010-08-31 20:07:38 +00:00
smc
2012-02-26 07:48:45 +01:00
2012-05-17 03:29:21 +02:00
2012-07-29 08:06:30 +02:00
2012-12-30 23:37:14 +01:00
2012-12-31 00:41:35 +01:00
2012-12-30 23:09:49 +01:00
2012-12-30 23:55:28 +01:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-29 20:20:02 +02:00
2013-01-03 07:25:47 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-10-16 18:51:16 +02:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-06-22 00:16:03 +00:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
w64
2010-03-15 19:23:24 +00:00
2012-02-26 07:48:45 +01:00
2010-08-28 14:51:51 +00:00
2012-10-15 08:32:34 +02:00
2012-07-04 15:10:57 +03:00
2012-01-08 18:33:59 -08:00
2013-02-07 07:18:57 +01:00
2012-12-10 11:19:42 -05:00