ffmpeg/tests/ref
Michael Niedermayer 2af8f2cea6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
  cmdutils: use new avcodec_is_decoder/encoder() functions.
  lavc: make codec_is_decoder/encoder() public.
  lavc: deprecate AVCodecContext.sub_id.
  libcdio: add a forgotten AVClass to the private context.
  swscale: remove "cpu flags" from -sws_flags description.
  proresenc: give user a possibility to alter some encoding parameters
  vorbisenc: add output buffer overwrite protection
  libopencore-amrnbenc: fix end-of-stream handling
  ra144enc: fix end-of-stream handling
  nellymoserenc: zero any leftover packet bytes
  nellymoserenc: use proper MDCT overlap delay
  qpeg: Use bytestream2 functions to prevent buffer overreads.
  swscale: make %rep unconditional.
  vp8: convert simple loopfilter x86 assembly to use named arguments.
  vp8: convert idct x86 assembly to use named arguments.
  vp8: convert mc x86 assembly to use named arguments.
  vp8: convert loopfilter x86 assembly to use cpuflags().
  vp8: convert idct/mc x86 assembly to use cpuflags().
  swscale: remove now unnecessary hack.
  x86inc: don't "bake" stack_offset in named arguments.
  ...

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/qpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavdevice/libcdio.c
	tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-05 00:15:55 +01:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
fate lavf: Do not compute the packet duration based on the bitrate if the frame_size can be determined. 2012-03-04 04:27:01 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
lavf-fate
lavfi fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
seek Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00