ffmpeg/tests/ref
Michael Niedermayer 8c1f98d954 Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
  lavfi: remove vf_slicify

Conflicts:
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_slicify.c
	tests/lavfi-regression.sh
	tests/ref/lavfi/crop_scale_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:59:15 +01:00
..
fate vf_select: switch to filter_frame 2012-11-28 21:28:02 +01:00
lavf Add an annotation field as required by the specification when muxing Sun AU. 2012-11-24 10:43:11 +01:00
lavf-fate
lavfi Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc' 2012-11-28 23:59:15 +01:00
seek Add an annotation field as required by the specification when muxing Sun AU. 2012-11-24 10:43:11 +01:00
vsynth1
vsynth2