Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-03-20 22:07:14 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2016-03-26 18:39:19 +0300
commitd4424d7de2c9a18f32b9617ca7c08950ecccbb7c (patch)
tree677466b36cda0246154eb5ed24f3c7c4a3d7ad13 /tests
parent28688d7c2b534cc36004ce27f2fafc6861e67f3f (diff)
fate: Modify a random h264 test to also test the -framerate option
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/h264.mak5
-rw-r--r--tests/ref/fate/h264-conformance-ba1_ft_c2
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 164fc9e70f..d1a0165a30 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -205,7 +205,10 @@ FATE_SAMPLES_FFPROBE += $(FATE_H264_FFPROBE-yes)
fate-h264: $(FATE_H264-yes) $(FATE_H264_FFPROBE-yes)
fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
-fate-h264-conformance-ba1_ft_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
+
+#force framerate so that the option is tested, theres no other case that tests it, its not needed at all otherwise here
+fate-h264-conformance-ba1_ft_c: CMD = framecrc -vsync drop -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
+
fate-h264-conformance-ba1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv
fate-h264-conformance-ba2_sony_f: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA2_Sony_F.jsv
fate-h264-conformance-ba3_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA3_SVA_C.264
diff --git a/tests/ref/fate/h264-conformance-ba1_ft_c b/tests/ref/fate/h264-conformance-ba1_ft_c
index 9f6bc2344f..70db0bbfac 100644
--- a/tests/ref/fate/h264-conformance-ba1_ft_c
+++ b/tests/ref/fate/h264-conformance-ba1_ft_c
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/19
0, 0, 0, 1, 152064, 0xa6f9b2a8
0, 1, 1, 1, 152064, 0x936a8ed6
0, 2, 2, 1, 152064, 0xa9f47652