1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/tests
Michael Niedermayer f1b5693027 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-07 22:58:39 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ref Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
audiogen.c
base64.c
codec-regression.sh codec-regression: force vsync 0 on the me_threshold test to make sure frames match. 2011-09-01 16:35:38 -07:00
copycooker.sh
fate2.mak avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +02:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
fate-update.sh
fate.mak avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +02:00
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
lavfi-regression.sh
lena.pnm
Makefile fate: Switch default tool to test from avconv to ffmpeg 2011-08-30 18:16:03 +02:00
md5.sh
regression-funcs.sh Revert "avconv: use stream copy by default when possible." 2011-08-16 20:59:14 +02:00
rotozoom.c
tiny_psnr.c
videogen.c