ffmpeg/tests/ref
Michael Niedermayer 93e3ec451c Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10
* commit '9925f7df0a50387ade8d83cb85b40c53e41e7041':
  vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
  r3d: Add more input value validation
  fraps: Make the input buffer size checks more strict
  svq3: Avoid a division by zero
  rmdec: Validate the fps value
  twinvqdec: Check the ibps parameter separately
  asfdec: Check the return value of asf_read_stream_properties
  mxfdec: set audio timebase to 1/samplerate
  pcx: Check the packet size before assuming it fits a palette
  rpza: Fix a buffer size check
  xxan: Disallow odd width
  xan: Only read within the data that actually was initialized

Conflicts:
	libavcodec/fraps.c
	libavformat/mxfdec.c
	tests/ref/seek/lavf_mxf
	tests/ref/seek/lavf_mxf_d10

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-16 22:44:32 +01:00
..
acodec Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2012-03-16 09:01:08 +01:00
fate Merge commit '36fc320747a768335ae4538a24a5739033b7eb74' into release/0.10 2013-11-04 18:50:55 +01:00
lavf asfenc: properly write index information 2012-09-12 16:48:59 +02:00
lavfi Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
seek Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10 2014-01-16 22:44:32 +01:00
vsynth1 movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
vsynth2 movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00