ffmpeg/tests/ref
Michael Niedermayer e387c9d5dd Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  rv40dsp x86: use only one register, for both increment and loop counter
  rv40dsp: implement prescaled versions for biweight.
  avconv: use default channel layouts when they are unknown
  avconv: parse channel layout string
  nutdec: K&R formatting cosmetics
  vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
  mem: Consistently return NULL for av_malloc(0)
  vf_overlay: implement poll_frame()
  vf_scale: support named constants for sws flags.
  lavc doxy: add all installed headers to doxy groups.
  lavc doxy: add avfft to the main lavc group.
  lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
  lavc doxy: add AVPicture functions to a doxy group.
  lavc doxy: add resampling functions to a doxy group.
  lavc doxy: replace \ with /
  lavc doxy: add encoding functions to a doxy group.
  lavc doxy: add decoding functions to a doxy group.
  lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
  lavc doxy: add AVPacket-related stuff to a separate doxy group.
  lavc doxy: add core functions/definitions to a doxy group.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/vda.c
	libavcodec/x86/rv40dsp.asm
	libavfilter/vf_scale.c
	libavformat/nutdec.c
	libavutil/mem.c
	tests/ref/acodec/pcm_s24daud

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-10 22:53:25 +02:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-04-10 22:53:25 +02:00
fate Update reference for disabled fate-wmv8-x8intra test to new format. 2012-04-08 20:01:07 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2012-04-10 22:53:25 +02:00
lavf-fate Do not decode the mp3 data in lavf test since that is not bit-exact. 2012-04-07 16:35:28 +02:00
lavfi vf_scale: ensure the palette is set for output. 2012-04-09 17:21:35 +02:00
seek asfenc: properly write index information 2012-04-05 06:03:10 +02:00
vsynth1 vf_scale: ensure the palette is set for output. 2012-04-09 17:21:35 +02:00
vsynth2 vf_scale: ensure the palette is set for output. 2012-04-09 17:21:35 +02:00