[FFmpeg-cvslog] fate/sub2video: move sws flags globally in the filtergraph.

Clément Bœsch git at videolan.org
Wed Jan 2 22:51:06 CET 2013


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Jan  2 21:44:43 2013 +0100| [fc86f863536b711a443f981d45913172190c8030] | committer: Clément Bœsch

fate/sub2video: move sws flags globally in the filtergraph.

The flags are necessary for the auto inserted scaler (because the
overlay filter needs an alpha channel for the overlay surface).

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc86f863536b711a443f981d45913172190c8030
---

 tests/fate/ffmpeg.mak    |    2 +-
 tests/ref/fate/sub2video |   50 +++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index f436cf8..b98ccd8 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -25,5 +25,5 @@ fate-sub2video: tests/data/vsynth2.yuv
 fate-sub2video: CMD = framecrc \
   -f rawvideo -r 5 -s 352x288 -pix_fmt yuv420p -i tests/data/vsynth2.yuv \
   -ss 132 -i $(SAMPLES)/sub/vobsub.idx \
-  -filter_complex "[0:0]scale=720:480:flags=+accurate_rnd+bitexact[v];[v][1:0]overlay[v2]" \
+  -filter_complex "sws_flags=+accurate_rnd+bitexact;[0:0]scale=720:480[v];[v][1:0]overlay[v2]" \
   -map "[v2]" -c:v rawvideo -map 1:s -c:s dvdsub
diff --git a/tests/ref/fate/sub2video b/tests/ref/fate/sub2video
index 8844289..f866c21 100644
--- a/tests/ref/fate/sub2video
+++ b/tests/ref/fate/sub2video
@@ -4,31 +4,31 @@
 0,          1,          1,        1,   518400, 0xa814ca60
 0,          2,          2,        1,   518400, 0xa771e1af
 1,        499,        499,     4960,     1015, 0x19e092d2, F=0x0
-0,          3,          3,        1,   518400, 0x4276bac0
-0,          4,          4,        1,   518400, 0x3448a869
-0,          5,          5,        1,   518400, 0xdf44bf38
-0,          6,          6,        1,   518400, 0x9c4110e0
-0,          7,          7,        1,   518400, 0x1abc7765
-0,          8,          8,        1,   518400, 0xc3ddb6b6
-0,          9,          9,        1,   518400, 0x3b9d0ac1
-0,         10,         10,        1,   518400, 0xd7e6a158
-0,         11,         11,        1,   518400, 0x7757a8c9
-0,         12,         12,        1,   518400, 0xfd85fb27
-0,         13,         13,        1,   518400, 0xfd3fa87c
-0,         14,         14,        1,   518400, 0x2fed80da
-0,         15,         15,        1,   518400, 0x9ae935ac
-0,         16,         16,        1,   518400, 0x487512c5
-0,         17,         17,        1,   518400, 0xfc880ba5
-0,         18,         18,        1,   518400, 0xa3b22ee7
-0,         19,         19,        1,   518400, 0x054870f8
-0,         20,         20,        1,   518400, 0x4c34ebef
-0,         21,         21,        1,   518400, 0xf36c5405
-0,         22,         22,        1,   518400, 0x2378a54a
-0,         23,         23,        1,   518400, 0x0cd9b9c3
-0,         24,         24,        1,   518400, 0x66c76567
-0,         25,         25,        1,   518400, 0xde86e454
-0,         26,         26,        1,   518400, 0xc1341d1b
-0,         27,         27,        1,   518400, 0x419b152f
+0,          3,          3,        1,   518400, 0x267abb76
+0,          4,          4,        1,   518400, 0x184ca91f
+0,          5,          5,        1,   518400, 0xc348bfee
+0,          6,          6,        1,   518400, 0x80451196
+0,          7,          7,        1,   518400, 0xfeb1781b
+0,          8,          8,        1,   518400, 0xa7e1b76c
+0,          9,          9,        1,   518400, 0x1fa10b77
+0,         10,         10,        1,   518400, 0xbbeaa20e
+0,         11,         11,        1,   518400, 0x5b5ba97f
+0,         12,         12,        1,   518400, 0xe189fbdd
+0,         13,         13,        1,   518400, 0xe143a932
+0,         14,         14,        1,   518400, 0x13f18190
+0,         15,         15,        1,   518400, 0x7eed3662
+0,         16,         16,        1,   518400, 0x2c79137b
+0,         17,         17,        1,   518400, 0xe08c0c5b
+0,         18,         18,        1,   518400, 0x87b62f9d
+0,         19,         19,        1,   518400, 0xe93d71ae
+0,         20,         20,        1,   518400, 0x3038eca5
+0,         21,         21,        1,   518400, 0xd77054bb
+0,         22,         22,        1,   518400, 0x077ca600
+0,         23,         23,        1,   518400, 0xf0ceba79
+0,         24,         24,        1,   518400, 0x4acb661d
+0,         25,         25,        1,   518400, 0xc28ae50a
+0,         26,         26,        1,   518400, 0xa5381dd1
+0,         27,         27,        1,   518400, 0x259f15e5
 0,         28,         28,        1,   518400, 0xe1487038
 0,         29,         29,        1,   518400, 0x7b5e5ec3
 0,         30,         30,        1,   518400, 0x6b638cee



More information about the ffmpeg-cvslog mailing list