summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-20 12:45:36 +0100
committerAnton Khirnov <anton@khirnov.net>2011-11-23 20:19:26 +0100
commit50efd3cad8b2a77d98b9e6b6637ef70fe70c6681 (patch)
treed5906877140ea3578f2ff6e9a4f48245c20cd6bf
parent3a0b72dee0d92470cd8bd986dd419e387c7cf5ec (diff)
md5enc: add flags
AVFMT_NOTIMESTAMPS for md5, as it ignores the timestamps. AVFMT_VARIABLE_FPS for framemd5, as it prints dts. -vsync 0 for the vp8 test is needed because with vsync 2 the timestamp guessing code gets confused by an altref frame that is never displayed and drops a frame later.
-rw-r--r--libavformat/md5enc.c2
-rw-r--r--tests/fate/vp8.mak2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
index dc8919a8c8..4509c18e84 100644
--- a/libavformat/md5enc.c
+++ b/libavformat/md5enc.c
@@ -75,6 +75,7 @@ AVOutputFormat ff_md5_muxer = {
.write_header = write_header,
.write_packet = write_packet,
.write_trailer = write_trailer,
+ .flags = AVFMT_NOTIMESTAMPS,
};
#endif
@@ -102,5 +103,6 @@ AVOutputFormat ff_framemd5_muxer = {
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,
.write_packet = framemd5_write_packet,
+ .flags = AVFMT_VARIABLE_FPS,
};
#endif
diff --git a/tests/fate/vp8.mak b/tests/fate/vp8.mak
index 1f442af4ac..be8f50aaf8 100644
--- a/tests/fate/vp8.mak
+++ b/tests/fate/vp8.mak
@@ -10,7 +10,7 @@ define FATE_VP8_FULL
$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
FATE_VP8 += fate-vp8-sign-bias$(1)
-fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
+fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf -vsync 0
fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
endef