diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:49:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:51:24 +0200 |
| commit | bc8240518830ba0d273bba6246392707ab55da2b (patch) | |
| tree | 8da3863948e1099f68f28e95d7bfe44c2a8b5609 /tests | |
| parent | cce254373c41b0b6c92cf71ad3099327a9f7b523 (diff) | |
| parent | 52ea29867070243385220a223d7512ea7d4ae2d2 (diff) | |
| download | ffmpeg-bc8240518830ba0d273bba6246392707ab55da2b.tar.gz | |
Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'
* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
fate: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter-video.mak | 8 | ||||
| -rw-r--r-- | tests/fate/h264.mak | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index eb5559172e..42d751618d 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -124,10 +124,10 @@ FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100" FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale -fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=400:-1" +fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=w=400:h=-1" FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip -fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null" +fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=w=200:h=200,scale=w=250:h=250,vflip,vflip,null,scale=w=200:h=200,crop=iw-100:ih-100:100:100,vflip,scale=w=200:h=200,null,vflip,crop=iw-100:ih-100:100:100,null" FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip fate-filter-crop_vflip: CMD = video_filter "crop=iw-100:ih-100:100:100,vflip" @@ -136,10 +136,10 @@ FATE_FILTER_VSYNTH-$(CONFIG_NULL_FILTER) += fate-filter-null fate-filter-null: CMD = video_filter "null" FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale200 -fate-filter-scale200: CMD = video_filter "scale=200:200" +fate-filter-scale200: CMD = video_filter "scale=w=200:h=200" FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500 -fate-filter-scale500: CMD = video_filter "scale=500:500" +fate-filter-scale500: CMD = video_filter "scale=w=500:h=500" FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip fate-filter-vflip: CMD = video_filter "vflip" diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 3386181aa1..55270d0d50 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -392,4 +392,4 @@ fate-h264-extreme-plane-pred: CMD = framemd5 -i $(TARGET_SAM fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 fate-h264-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264 -fate-h264-reinit-%: CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=352:288 +fate-h264-reinit-%: CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288 |