FFmpeg/tests/ref
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
..
acodec lswr: Improve default resampler's default parameters 2013-01-04 16:47:57 +01:00
fate Merge remote-tracking branch 'qatar/release/9' into release/1.1 2013-08-27 19:13:15 +02:00
lavf dpxenc: fix data offset 2013-03-18 03:27:33 +01:00
lavf-fate Merge commit '747fbe0c21' into release/1.1 2013-03-14 02:49:31 +01:00
lavfi lavfi/kerndeint: fix temp buffer linesize. 2013-01-06 18:59:15 +01:00
seek movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-18 18:22:04 +01:00
vsynth movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-18 18:22:04 +01:00
vsynth1 Merge commit 'f919cc7df6' 2012-05-30 01:40:54 +02:00
vsynth2 Merge commit 'f919cc7df6' 2012-05-30 01:40:54 +02:00