ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 07:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
d00bc6a8fd
FFmpeg/tests
History
Michael Niedermayer 184fc600e1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: only allocate output packet when we know there will be output
  Add names for more channel layouts to the channel layout map.
  sunrast: Add a sample request for RMP_RAW colormap.
  avcodec: do not override pts or duration from the audio encoder
  Add prores regression test.
  Enable already existing rso regression test.
  Add regression test for "sox" format muxer/demuxer.
  Add dpx encoding regression test.
  swscale: K&R formatting cosmetics for PowerPC code (part I/II)
  img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
  Clarify licensing information about files borrowed from libjpeg.
  Mark mutable static data const where appropriate.
  avplay: fix -threads option
  dvbsubdec: avoid undefined signed left shift in RGBA macro
  mlpdec: use av_log_ask_for_sample()
  gif: K&R formatting cosmetics
  png: make .long_name more descriptive
  movdec: Adjust keyframe flagging in fragmented files
  rv34: change most "int stride" into "ptrdiff_t stride".

Conflicts:
	avprobe.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pngenc.c
	libavcodec/x86/v210-init.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_settb.c
	libavformat/img2.c
	libavutil/audioconvert.c
	tests/codec-regression.sh
	tests/lavf-regression.sh
	tests/ref/lavf/dpx
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-22 02:24:18 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-02-14 03:24:27 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
copycooker.sh
fate_config.sh.template
fate-run.sh Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Add regression test for "sox" format muxer/demuxer. 2012-02-21 14:42:30 -05:00
lavfi-regression.sh
lena.pnm
Makefile Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
md5.sh
regression-funcs.sh Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
rotozoom.c
tiny_psnr.c
videogen.c