On 08/09/2016 07:42 PM, Michael Niedermayer wrote:
On Tue, Aug 09, 2016 at 01:26:04PM +0200, sebechlebsky...@gmail.com wrote:
From: Jan Sebechlebsky <sebechlebsky...@gmail.com>
Signed-off-by: Jan Sebechlebsky <sebechlebsky...@gmail.com>
---
Changes since the last version:
- Removed empty lines at the end of fifo_muxer.c file
[...]
diff --git a/tests/Makefile b/tests/Makefile
index 895944d..0848766 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -128,6 +128,7 @@ include $(SRC_PATH)/tests/fate/exif.mak
include $(SRC_PATH)/tests/fate/ffmpeg.mak
include $(SRC_PATH)/tests/fate/ffprobe.mak
include $(SRC_PATH)/tests/fate/fft.mak
+include $(SRC_PATH)/tests/fate/fifo-muxer.mak
include $(SRC_PATH)/tests/fate/filter-audio.mak
include $(SRC_PATH)/tests/fate/filter-video.mak
include $(SRC_PATH)/tests/fate/flac.mak
diff --git a/tests/fate/fifo-muxer.mak b/tests/fate/fifo-muxer.mak
new file mode 100644
index 0000000..a064069
--- /dev/null
+++ b/tests/fate/fifo-muxer.mak
@@ -0,0 +1,20 @@
+fate-fifo-muxer-h264: CMD = ffmpeg -i $(TARGET_SAMPLES)/mkv/1242-small.mkv
-vframes 11\
+ -c:v copy -c:a copy -map v:0 -map a:0 -flags
+bitexact\
+ -fflags +bitexact -f fifo -fifo_format framecrc -
+fate-fifo-muxer-h264: REF = $(SRC_PATH)/tests/ref/fate/mkv-1242
+FATE_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, MATROSKA_DEMUXER, H264_DECODER) +=
fate-fifo-muxer-h264
+
+fate-fifo-muxer-wav: CMD = ffmpeg -i
$(TARGET_SAMPLES)/audio-reference/chorusnoise_2ch_44kHz_s16.wav\
+ -c:a copy -map a:0 -flags +bitexact\
+ -fflags +bitexact -f fifo -fifo_format wav md5:
inconsistent mix of space and tab
+fate-fifo-muxer-wav: CMP = oneline
+fate-fifo-muxer-wav: REF = 4dda5dcc7ecdc2218b0739a152ada802
+FATE_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, WAV_DEMUXER) += fate-fifo-muxer-wav
+
+fate-fifo-muxer-tst: libavformat/tests/fifo_muxer$(EXESUF)
+fate-fifo-muxer-tst: CMD = run libavformat/tests/fifo_muxer
+FATE_FIFO_MUXER-$(CONFIG_FIFO_MUXER) += fate-fifo-muxer-tst
+
+FATE_SAMPLES_FFMPEG += fate-fifo-muxer-h264 fate-fifo-muxer-wav
+FATE_FFMPEG += fate-fifo-muxer-tst
+fate-fifo-muxer: $(FATE_FIFO_MUXER-yes)
works on linux 32 & 64bit
fails on mingw32 & 64
make: *** No rule to make target `libavformat/tests/fifo_muxer.exe', needed by
`fate-fifo-muxer-tst'.
make: Target `fate-fifo-muxer-tst' not remade because of errors.
I was not able to reproduce the exactly same error you got, however I've
fixed the whitespace and also there was $(EXESUF) missing at
fate-fifo-muxer-tst: CMD = run libavformat/tests/fifo_muxer
line - I hope that was the cause the test refused to built. I've setup
windows build and found also some other issues, now it passes fate on
linux 32/64 bit build and also mingw32/64 bit build.
Thank you for testing it - I will try to run windows tests as well in
future to avoid such mistakes.
I'll resend fixed patches soon - can you please re-run the
fate-fifo-muxer test as well in your environment?
Regards,
Jan
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
