[FFmpeg-cvslog] Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c'
James Almer
git at videolan.org
Thu Mar 14 20:44:22 EET 2019
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 14 14:36:24 2019 -0300| [fda424b300c1a0b991296aa585691609d01196bd] | committer: James Almer
Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c'
* commit '618d02c1fa9e74d490cace64a7d15762656b521c':
tests: Convert lavf container tests to non-legacy test scripts
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fda424b300c1a0b991296aa585691609d01196bd
---
tests/Makefile | 1 +
tests/fate-run.sh | 20 +++++
tests/fate/api.mak | 2 +-
tests/fate/avformat.mak | 21 ------
tests/fate/lavf-container.mak | 57 ++++++++++++++
tests/fate/seek.mak | 8 +-
tests/lavf-regression.sh | 121 ------------------------------
tests/ref/lavf/asf | 6 +-
tests/ref/lavf/avi | 6 +-
tests/ref/lavf/dv | 3 +
tests/ref/lavf/dv_fmt | 9 ---
tests/ref/lavf/dv_ntsc | 3 +
tests/ref/lavf/dv_pal | 3 +
tests/ref/lavf/flm | 6 +-
tests/ref/lavf/flv | 3 +
tests/ref/lavf/flv_fmt | 3 -
tests/ref/lavf/gxf | 12 +--
tests/ref/lavf/gxf_ntsc | 3 +
tests/ref/lavf/gxf_pal | 3 +
tests/ref/lavf/ismv | 18 ++---
tests/ref/lavf/mkv | 9 +--
tests/ref/lavf/mkv_attachment | 3 +
tests/ref/lavf/mov | 30 +++-----
tests/ref/lavf/mov_rtphint | 3 +
tests/ref/lavf/mp4 | 9 +++
tests/ref/lavf/mpg | 18 ++---
tests/ref/lavf/mxf | 18 ++---
tests/ref/lavf/mxf_d10 | 6 +-
tests/ref/lavf/mxf_dv25 | 6 +-
tests/ref/lavf/mxf_dvcpro50 | 6 +-
tests/ref/lavf/mxf_opatom | 6 +-
tests/ref/lavf/mxf_opatom_audio | 6 +-
tests/ref/lavf/nut | 6 +-
tests/ref/lavf/rm | 4 +-
tests/ref/lavf/smjpeg | 6 +-
tests/ref/lavf/swf | 6 +-
tests/ref/lavf/ts | 6 +-
tests/ref/lavf/wtv | 6 +-
tests/ref/seek/{lavf-dv_fmt => lavf-dv} | 0
tests/ref/seek/{lavf-flv_fmt => lavf-flv} | 0
40 files changed, 199 insertions(+), 263 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 99ea0fe20b..3d88a5ddd6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -91,6 +91,7 @@ include $(SRC_PATH)/tests/fate/vcodec.mak
include $(SRC_PATH)/tests/fate/avformat.mak
include $(SRC_PATH)/tests/fate/lavf-audio.mak
+include $(SRC_PATH)/tests/fate/lavf-container.mak
include $(SRC_PATH)/tests/fate/lavf-image.mak
include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak
include $(SRC_PATH)/tests/fate/seek.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index a2ccc65a63..ebd5c14c17 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -290,6 +290,26 @@ lavf_audio(){
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
}
+lavf_container(){
+ t="${test#lavf-}"
+ outdir="tests/data/lavf"
+ file=${outdir}/lavf.$t
+ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -b:a 64k -t 1 -qscale:v 10 $2
+ test $3 = "disable_crc" ||
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+}
+
+lavf_container_attach() { lavf_container "" "$1 -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap"; }
+lavf_container_timecode_nodrop() { lavf_container "" "$1 -timecode 02:56:14:13"; }
+lavf_container_timecode_drop() { lavf_container "" "$1 -timecode 02:56:14.13 -r 30000/1001"; }
+
+lavf_container_timecode()
+{
+ lavf_container_timecode_nodrop "$@"
+ lavf_container_timecode_drop "$@"
+ lavf_container "" "$1"
+}
+
lavf_image(){
t="${test#lavf-}"
outdir="tests/data/images/$t"
diff --git a/tests/fate/api.mak b/tests/fate/api.mak
index 3714f900bd..b716b3b901 100644
--- a/tests/fate/api.mak
+++ b/tests/fate/api.mak
@@ -17,7 +17,7 @@ fate-api-h264-slice: $(APITESTSDIR)/api-h264-slice-test$(EXESUF)
fate-api-h264-slice: CMD = run $(APITESTSDIR)/api-h264-slice-test 2 $(TARGET_SAMPLES)/h264/crew_cif.nal
FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek
-fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv_fmt
+fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv
fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720
fate-api-seek: CMP = null
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 452edc788f..e2f4d01dbe 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,27 +1,6 @@
FATE_LAVF-$(call ENCDEC, APNG, APNG) += apng
-FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
-FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
FATE_LAVF-$(call ENCDEC, FITS, FITS) += fits
-FATE_LAVF-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm
-FATE_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
-FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov ismv
-FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
-FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25
-FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50
-FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
-FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
-FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
-FATE_LAVF-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg
-FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
-FATE_LAVF-$(call ENCDEC, MP2, WTV) += wtv
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
new file mode 100644
index 0000000000..2f3fd03385
--- /dev/null
+++ b/tests/fate/lavf-container.mak
@@ -0,0 +1,57 @@
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
+FATE_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv dv_pal dv_ntsc
+FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv
+FATE_LAVF_CONTAINER-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf gxf_pal gxf_ntsc
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv mkv_attachment
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov mov_rtphint ismv
+FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MOV) += mp4
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf mxf_dv25 mxf_dvcpro50
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
+FATE_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom mxf_opatom_audio
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
+FATE_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
+FATE_LAVF_CONTAINER-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg
+FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf
+FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
+FATE_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv
+
+FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_CONTAINER): CMD = lavf_container
+$(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_CONTAINER): $(AREF) $(VREF)
+
+fate-lavf-asf: CMD = lavf_container "" "-c:a mp2 -ar 44100" "-r 25"
+fate-lavf-avi fate-lavf-nut: CMD = lavf_container "" "-c:a mp2 -ar 44100 -threads 1"
+fate-lavf-dv: CMD = lavf_container "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
+fate-lavf-dv_pal: CMD = lavf_container_timecode_nodrop "-ar 48000 -r 25 -s pal -ac 2 -f dv"
+fate-lavf-dv_ntsc: CMD = lavf_container_timecode_drop "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2 -f dv"
+fate-lavf-flv fate-lavf-swf: CMD = lavf_container "" "-an"
+fate-lavf-flm: CMD = lavf_container "" "-pix_fmt rgba"
+fate-lavf-gxf: CMD = lavf_container "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
+fate-lavf-gxf_pal: CMD = lavf_container_timecode_nodrop "-ar 48000 -r 25 -s pal -ac 1 -threads 1 -f gxf"
+fate-lavf-gxf_ntsc: CMD = lavf_container_timecode_drop "-ar 48000 -s ntsc -ac 1 -threads 1 -f gxf"
+fate-lavf-ismv: CMD = lavf_container_timecode "-an -c:v mpeg4 -threads 1"
+fate-lavf-mkv: CMD = lavf_container "" "-c:a mp2 -c:v mpeg4 -ar 44100 -threads 1"
+fate-lavf-mkv_attachment: CMD = lavf_container_attach "-c:a mp2 -c:v mpeg4 -threads 1 -f matroska"
+fate-lavf-mov: CMD = lavf_container_timecode "-movflags +faststart -c:a pcm_alaw -c:v mpeg4 -threads 1"
+fate-lavf-mov_rtphint: CMD = lavf_container "" "-movflags +rtphint -c:a pcm_alaw -c:v mpeg4 -threads 1 -f mov"
+fate-lavf-mp4: CMD = lavf_container_timecode "-c:v mpeg4 -an -threads 1"
+fate-lavf-mpg: CMD = lavf_container_timecode "-ar 44100 -threads 1"
+fate-lavf-mxf: CMD = lavf_container_timecode "-ar 48000 -bf 2 -threads 1"
+fate-lavf-mxf_d10: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+fate-lavf-mxf_dv25: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -c:v dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
+fate-lavf-mxf_dvcpro50: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -c:v dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
+fate-lavf-mxf_opatom: CMD = lavf_container "" "-s 1920x1080 -c:v dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
+fate-lavf-mxf_opatom_audio: CMD = lavf_container "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
+fate-lavf-smjpeg: CMD = lavf_container "" "-f smjpeg"
+# The RealMedia muxer is broken.
+fate-lavf-rm: CMD = lavf_container "" "-c:a ac3_fixed" disable_crc
+fate-lavf-ts: CMD = lavf_container "" "-mpegts_transport_stream_id 42 -ar 44100 -threads 1"
+fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1"
+
+FATE_AVCONV += $(FATE_LAVF_CONTAINER)
+fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER)
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 0df87d8982..d466498723 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -167,8 +167,8 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_SEEK_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
-FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
+FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv
+FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv
FATE_SEEK_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
FATE_SEEK_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg
@@ -208,8 +208,8 @@ fate-seek-lavf-asf: SRC = lavf/lavf.asf
fate-seek-lavf-au: SRC = lavf/lavf.au
fate-seek-lavf-avi: SRC = lavf/lavf.avi
fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp
-fate-seek-lavf-dv_fmt: SRC = lavf/lavf.dv
-fate-seek-lavf-flv_fmt: SRC = lavf/lavf.flv
+fate-seek-lavf-dv: SRC = lavf/lavf.dv
+fate-seek-lavf-flv: SRC = lavf/lavf.flv
fate-seek-lavf-gif: SRC = lavf/lavf.gif
fate-seek-lavf-gxf: SRC = lavf/lavf.gxf
fate-seek-lavf-jpg: SRC = images/jpg/%02d.jpg
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index f703cb9c0e..719aac205e 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -21,119 +21,6 @@ do_lavf_fate()
do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
}
-do_lavf()
-{
- file=${outfile}lavf.$1
- do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
- test $5 = "disable_crc" ||
- do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
-}
-
-do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
-do_lavf_timecode_drop() { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
-
-do_lavf_timecode()
-{
- do_lavf_timecode_nodrop "$@"
- do_lavf_timecode_drop "$@"
- do_lavf $1 "" "$2"
-}
-
-if [ -n "$do_avi" ] ; then
-do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
-fi
-
-if [ -n "$do_asf" ] ; then
-do_lavf asf "" "-acodec mp2 -ar 44100 -ab 64k" "-r 25"
-fi
-
-if [ -n "$do_rm" ] ; then
-file=${outfile}lavf.rm
-# The RealMedia muxer is broken.
-do_lavf rm "" "-c:a ac3_fixed" "" disable_crc
-fi
-
-if [ -n "$do_mpg" ] ; then
-do_lavf_timecode mpg "-ab 64k -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_mxf" ] ; then
-do_lavf_timecode mxf "-ar 48000 -bf 2 -threads 1"
-fi
-
-if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
-fi
-
-if [ -n "$do_mxf_dv25" ]; then
-do_lavf mxf_dv25 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -vcodec dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
-fi
-
-if [ -n "$do_mxf_dvcpro50" ]; then
-do_lavf mxf_dvcpro50 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
-fi
-
-if [ -n "$do_mxf_opatom" ]; then
-do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
-fi
-
-if [ -n "$do_mxf_opatom_audio" ]; then
-do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
-fi
-
-if [ -n "$do_ts" ] ; then
-do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_swf" ] ; then
-do_lavf swf "" "-an"
-fi
-
-if [ -n "$do_ffm" ] ; then
-do_lavf ffm "" "-ar 44100 -threads 1"
-fi
-
-if [ -n "$do_flm" ] ; then
-do_lavf flm "" "-pix_fmt rgba"
-fi
-
-if [ -n "$do_flv_fmt" ] ; then
-do_lavf flv "" "-an"
-fi
-
-if [ -n "$do_mov" ] ; then
-mov_common_opt="-acodec pcm_alaw -vcodec mpeg4 -threads 1"
-do_lavf mov "" "-movflags +rtphint $mov_common_opt"
-do_lavf_timecode mov "-movflags +faststart $mov_common_opt"
-do_lavf_timecode mp4 "-vcodec mpeg4 -an -threads 1"
-fi
-
-if [ -n "$do_ismv" ] ; then
-do_lavf_timecode ismv "-an -vcodec mpeg4 -threads 1"
-fi
-
-if [ -n "$do_dv_fmt" ] ; then
-do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2"
-do_lavf_timecode_drop dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2"
-do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
-fi
-
-if [ -n "$do_gxf" ] ; then
-do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1 -threads 1"
-do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1 -threads 1"
-do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
-fi
-
-if [ -n "$do_nut" ] ; then
-do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_mkv" ] ; then
-do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
- -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
-do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100 -threads 1"
-fi
-
if [ -n "$do_mp3" ] ; then
do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy"
fi
@@ -162,10 +49,6 @@ DEC_OPTS="$DEC_OPTS -idct auto"
do_lavf_fate avi "cram/toon.avi"
fi
-if [ -n "$do_wtv" ] ; then
-do_lavf wtv "" "-acodec mp2 -threads 1"
-fi
-
# streamed images
# mjpeg
@@ -205,7 +88,3 @@ for pix_fmt in $pix_fmts ; do
do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt $pix_fmt
done
fi
-
-if [ -n "$do_smjpeg" ] ; then
-do_lavf smjpeg "" "-f smjpeg"
-fi
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
index 911af72051..fbcbd480d0 100644
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@ -1,3 +1,3 @@
-76f131a5426f0ba5fc7409d1a1bbfdd7 *./tests/data/lavf/lavf.asf
-333585 ./tests/data/lavf/lavf.asf
-./tests/data/lavf/lavf.asf CRC=0xf6340a10
+76f131a5426f0ba5fc7409d1a1bbfdd7 *tests/data/lavf/lavf.asf
+333585 tests/data/lavf/lavf.asf
+tests/data/lavf/lavf.asf CRC=0xf6340a10
diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi
index dfdb392de7..b8c2f7a38b 100644
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@ -1,3 +1,3 @@
-ab696052289d8dfea193e4cf94a94a6f *./tests/data/lavf/lavf.avi
-330814 ./tests/data/lavf/lavf.avi
-./tests/data/lavf/lavf.avi CRC=0xec6c3c68
+ab696052289d8dfea193e4cf94a94a6f *tests/data/lavf/lavf.avi
+330814 tests/data/lavf/lavf.avi
+tests/data/lavf/lavf.avi CRC=0xec6c3c68
diff --git a/tests/ref/lavf/dv b/tests/ref/lavf/dv
new file mode 100644
index 0000000000..7ae4223a21
--- /dev/null
+++ b/tests/ref/lavf/dv
@@ -0,0 +1,3 @@
+2fb332aab8f2ba9c33b1b2368194392a *tests/data/lavf/lavf.dv
+3600000 tests/data/lavf/lavf.dv
+tests/data/lavf/lavf.dv CRC=0xbdaf7f52
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt
deleted file mode 100644
index 0263202c8e..0000000000
--- a/tests/ref/lavf/dv_fmt
+++ /dev/null
@@ -1,9 +0,0 @@
-7830f9c6716ceb6011f865f1e521b951 *./tests/data/lavf/lavf.dv
-3600000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/lavf.dv CRC=0xd428d3ee
-5569626370c7c72d40de2c4559e32856 *./tests/data/lavf/lavf.dv
-3480000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/lavf.dv CRC=0xa0088163
-2fb332aab8f2ba9c33b1b2368194392a *./tests/data/lavf/lavf.dv
-3600000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/lavf.dv CRC=0xbdaf7f52
diff --git a/tests/ref/lavf/dv_ntsc b/tests/ref/lavf/dv_ntsc
new file mode 100644
index 0000000000..410b6ec254
--- /dev/null
+++ b/tests/ref/lavf/dv_ntsc
@@ -0,0 +1,3 @@
+5569626370c7c72d40de2c4559e32856 *tests/data/lavf/lavf.dv_ntsc
+3480000 tests/data/lavf/lavf.dv_ntsc
+tests/data/lavf/lavf.dv_ntsc CRC=0xa0088163
diff --git a/tests/ref/lavf/dv_pal b/tests/ref/lavf/dv_pal
new file mode 100644
index 0000000000..93bb728c46
--- /dev/null
+++ b/tests/ref/lavf/dv_pal
@@ -0,0 +1,3 @@
+7830f9c6716ceb6011f865f1e521b951 *tests/data/lavf/lavf.dv_pal
+3600000 tests/data/lavf/lavf.dv_pal
+tests/data/lavf/lavf.dv_pal CRC=0xd428d3ee
diff --git a/tests/ref/lavf/flm b/tests/ref/lavf/flm
index 59aac922ae..15ca5ff458 100644
--- a/tests/ref/lavf/flm
+++ b/tests/ref/lavf/flm
@@ -1,3 +1,3 @@
-ef4783171ebbc38855331c9ead978322 *./tests/data/lavf/lavf.flm
-10137636 ./tests/data/lavf/lavf.flm
-./tests/data/lavf/lavf.flm CRC=0xcdf15757
+ef4783171ebbc38855331c9ead978322 *tests/data/lavf/lavf.flm
+10137636 tests/data/lavf/lavf.flm
+tests/data/lavf/lavf.flm CRC=0xcdf15757
diff --git a/tests/ref/lavf/flv b/tests/ref/lavf/flv
new file mode 100644
index 0000000000..3153472656
--- /dev/null
+++ b/tests/ref/lavf/flv
@@ -0,0 +1,3 @@
+0d229f87b3aad778074ace499359d137 *tests/data/lavf/lavf.flv
+329554 tests/data/lavf/lavf.flv
+tests/data/lavf/lavf.flv CRC=0x4eac88c5
diff --git a/tests/ref/lavf/flv_fmt b/tests/ref/lavf/flv_fmt
deleted file mode 100644
index f014bec708..0000000000
--- a/tests/ref/lavf/flv_fmt
+++ /dev/null
@@ -1,3 +0,0 @@
-0d229f87b3aad778074ace499359d137 *./tests/data/lavf/lavf.flv
-329554 ./tests/data/lavf/lavf.flv
-./tests/data/lavf/lavf.flv CRC=0x4eac88c5
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index 4dd463cd2a..e8351fab86 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,9 +1,3 @@
-6ef34e8bedf699cd1601022c4a0a4910 *./tests/data/lavf/lavf.gxf
-795876 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0x1dbfef76
-7780c428dde2c93a9ff04794f7168440 *./tests/data/lavf/lavf.gxf
-794656 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0xdcd39443
-0638c4d073ac224608baaba16732b68f *./tests/data/lavf/lavf.gxf
-795876 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0x5ade0285
+0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf
+795876 tests/data/lavf/lavf.gxf
+tests/data/lavf/lavf.gxf CRC=0x5ade0285
diff --git a/tests/ref/lavf/gxf_ntsc b/tests/ref/lavf/gxf_ntsc
new file mode 100644
index 0000000000..60efd80462
--- /dev/null
+++ b/tests/ref/lavf/gxf_ntsc
@@ -0,0 +1,3 @@
+9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc
+794660 tests/data/lavf/lavf.gxf_ntsc
+tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443
diff --git a/tests/ref/lavf/gxf_pal b/tests/ref/lavf/gxf_pal
new file mode 100644
index 0000000000..aefcd0ccab
--- /dev/null
+++ b/tests/ref/lavf/gxf_pal
@@ -0,0 +1,3 @@
+4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal
+795880 tests/data/lavf/lavf.gxf_pal
+tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76
diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv
index 7b4a466096..96dc8c1c9d 100644
--- a/tests/ref/lavf/ismv
+++ b/tests/ref/lavf/ismv
@@ -1,9 +1,9 @@
-96053075a3f60d271131fe2d0765c267 *./tests/data/lavf/lavf.ismv
-312542 ./tests/data/lavf/lavf.ismv
-./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
-7022701b4c693bc4ffe1e9f96dd82a02 *./tests/data/lavf/lavf.ismv
-321448 ./tests/data/lavf/lavf.ismv
-./tests/data/lavf/lavf.ismv CRC=0xe8130120
-96053075a3f60d271131fe2d0765c267 *./tests/data/lavf/lavf.ismv
-312542 ./tests/data/lavf/lavf.ismv
-./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
+96053075a3f60d271131fe2d0765c267 *tests/data/lavf/lavf.ismv
+312542 tests/data/lavf/lavf.ismv
+tests/data/lavf/lavf.ismv CRC=0x9d9a638a
+7022701b4c693bc4ffe1e9f96dd82a02 *tests/data/lavf/lavf.ismv
+321448 tests/data/lavf/lavf.ismv
+tests/data/lavf/lavf.ismv CRC=0xe8130120
+96053075a3f60d271131fe2d0765c267 *tests/data/lavf/lavf.ismv
+312542 tests/data/lavf/lavf.ismv
+tests/data/lavf/lavf.ismv CRC=0x9d9a638a
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 0083033958..79f80f68cf 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,6 +1,3 @@
-7c8697c324e8ad79c5ea14364a6c39b8 *./tests/data/lavf/lavf.mkv
-472759 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
-9767a3b526d7e56d7400164cb888990c *./tests/data/lavf/lavf.mkv
-320603 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
+9767a3b526d7e56d7400164cb888990c *tests/data/lavf/lavf.mkv
+320603 tests/data/lavf/lavf.mkv
+tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment
new file mode 100644
index 0000000000..455a29feea
--- /dev/null
+++ b/tests/ref/lavf/mkv_attachment
@@ -0,0 +1,3 @@
+7c8697c324e8ad79c5ea14364a6c39b8 *tests/data/lavf/lavf.mkv_attachment
+472759 tests/data/lavf/lavf.mkv_attachment
+tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov
index 2e1f24dfc6..62ce95d2e6 100644
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@ -1,21 +1,9 @@
-a10d50f2679df92264e1fc21cb8be630 *./tests/data/lavf/lavf.mov
-366449 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xbb2b949b
-6258f70f974e3c802e01d02ac33c7bbd *./tests/data/lavf/lavf.mov
-357539 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xbb2b949b
-ba3b8b49e420510a0d417400dbedfc2d *./tests/data/lavf/lavf.mov
-366621 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xa9793231
-fd0e4de8e7f6d0c8c0681d7020f00f50 *./tests/data/lavf/lavf.mov
-356921 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xbb2b949b
-ebca72c186a4f3ba9bb17d9cb5b74fef *./tests/data/lavf/lavf.mp4
-312457 ./tests/data/lavf/lavf.mp4
-./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
-9944512475d82d2d601f3c96101bdf9c *./tests/data/lavf/lavf.mp4
-321343 ./tests/data/lavf/lavf.mp4
-./tests/data/lavf/lavf.mp4 CRC=0xe8130120
-7b3e71f294901067046c09f03a426bdc *./tests/data/lavf/lavf.mp4
-312001 ./tests/data/lavf/lavf.mp4
-./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
+6258f70f974e3c802e01d02ac33c7bbd *tests/data/lavf/lavf.mov
+357539 tests/data/lavf/lavf.mov
+tests/data/lavf/lavf.mov CRC=0xbb2b949b
+ba3b8b49e420510a0d417400dbedfc2d *tests/data/lavf/lavf.mov
+366621 tests/data/lavf/lavf.mov
+tests/data/lavf/lavf.mov CRC=0xa9793231
+fd0e4de8e7f6d0c8c0681d7020f00f50 *tests/data/lavf/lavf.mov
+356921 tests/data/lavf/lavf.mov
+tests/data/lavf/lavf.mov CRC=0xbb2b949b
diff --git a/tests/ref/lavf/mov_rtphint b/tests/ref/lavf/mov_rtphint
new file mode 100644
index 0000000000..857116a261
--- /dev/null
+++ b/tests/ref/lavf/mov_rtphint
@@ -0,0 +1,3 @@
+a10d50f2679df92264e1fc21cb8be630 *tests/data/lavf/lavf.mov_rtphint
+366449 tests/data/lavf/lavf.mov_rtphint
+tests/data/lavf/lavf.mov_rtphint CRC=0xbb2b949b
diff --git a/tests/ref/lavf/mp4 b/tests/ref/lavf/mp4
new file mode 100644
index 0000000000..8482812380
--- /dev/null
+++ b/tests/ref/lavf/mp4
@@ -0,0 +1,9 @@
+ebca72c186a4f3ba9bb17d9cb5b74fef *tests/data/lavf/lavf.mp4
+312457 tests/data/lavf/lavf.mp4
+tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
+9944512475d82d2d601f3c96101bdf9c *tests/data/lavf/lavf.mp4
+321343 tests/data/lavf/lavf.mp4
+tests/data/lavf/lavf.mp4 CRC=0xe8130120
+7b3e71f294901067046c09f03a426bdc *tests/data/lavf/lavf.mp4
+312001 tests/data/lavf/lavf.mp4
+tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index 7aab14f84b..332b7114b5 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,9 +1,9 @@
-01bbdea588da51ab4a9d1d26f3443c96 *./tests/data/lavf/lavf.mpg
-372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0x000e23ae
-87b447b78a7d1141b9d41bb3aa50434d *./tests/data/lavf/lavf.mpg
-389120 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
-284f41c914df75c12de01e223d65f87f *./tests/data/lavf/lavf.mpg
-372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0x000e23ae
+01bbdea588da51ab4a9d1d26f3443c96 *tests/data/lavf/lavf.mpg
+372736 tests/data/lavf/lavf.mpg
+tests/data/lavf/lavf.mpg CRC=0x000e23ae
+87b447b78a7d1141b9d41bb3aa50434d *tests/data/lavf/lavf.mpg
+389120 tests/data/lavf/lavf.mpg
+tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
+284f41c914df75c12de01e223d65f87f *tests/data/lavf/lavf.mpg
+372736 tests/data/lavf/lavf.mpg
+tests/data/lavf/lavf.mpg CRC=0x000e23ae
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 4466685a2d..471fc5518e 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,9 +1,9 @@
-649009e3d3d62eb3b6c56334d057cc4d *./tests/data/lavf/lavf.mxf
-526393 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
-9076b7015cffe8aa72883e900a2041a5 *./tests/data/lavf/lavf.mxf
-561721 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0x96ff1b48
-02bf8f0cd8951a49e277306691cb1538 *./tests/data/lavf/lavf.mxf
-526393 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
+649009e3d3d62eb3b6c56334d057cc4d *tests/data/lavf/lavf.mxf
+526393 tests/data/lavf/lavf.mxf
+tests/data/lavf/lavf.mxf CRC=0x8dddfaab
+9076b7015cffe8aa72883e900a2041a5 *tests/data/lavf/lavf.mxf
+561721 tests/data/lavf/lavf.mxf
+tests/data/lavf/lavf.mxf CRC=0x96ff1b48
+02bf8f0cd8951a49e277306691cb1538 *tests/data/lavf/lavf.mxf
+526393 tests/data/lavf/lavf.mxf
+tests/data/lavf/lavf.mxf CRC=0x8dddfaab
diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10
index 856fe9c3e9..aea469bb58 100644
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@
-e597f73ef9c9819710d2f815813eb91f *./tests/data/lavf/lavf.mxf_d10
-5332013 ./tests/data/lavf/lavf.mxf_d10
-./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
+e597f73ef9c9819710d2f815813eb91f *tests/data/lavf/lavf.mxf_d10
+5332013 tests/data/lavf/lavf.mxf_d10
+tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25
index e94b3ca1ca..db6b76c6f8 100644
--- a/tests/ref/lavf/mxf_dv25
+++ b/tests/ref/lavf/mxf_dv25
@@ -1,3 +1,3 @@
-0fc964fa22bc8b3a389b81b9a2efccb3 *./tests/data/lavf/lavf.mxf_dv25
-3834413 ./tests/data/lavf/lavf.mxf_dv25
-./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
+0fc964fa22bc8b3a389b81b9a2efccb3 *tests/data/lavf/lavf.mxf_dv25
+3834413 tests/data/lavf/lavf.mxf_dv25
+tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50
index 514a0475c9..09999914bf 100644
--- a/tests/ref/lavf/mxf_dvcpro50
+++ b/tests/ref/lavf/mxf_dvcpro50
@@ -1,3 +1,3 @@
-aa81ea83af44a69e73849e327cc4bd12 *./tests/data/lavf/lavf.mxf_dvcpro50
-7431213 ./tests/data/lavf/lavf.mxf_dvcpro50
-./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
+aa81ea83af44a69e73849e327cc4bd12 *tests/data/lavf/lavf.mxf_dvcpro50
+7431213 tests/data/lavf/lavf.mxf_dvcpro50
+tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom
index cc4eb519ea..05794a4e5e 100644
--- a/tests/ref/lavf/mxf_opatom
+++ b/tests/ref/lavf/mxf_opatom
@@ -1,3 +1,3 @@
-06a1816aa91c733e1ef7e45d82e4f1d3 *./tests/data/lavf/lavf.mxf_opatom
-4717625 ./tests/data/lavf/lavf.mxf_opatom
-./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
+06a1816aa91c733e1ef7e45d82e4f1d3 *tests/data/lavf/lavf.mxf_opatom
+4717625 tests/data/lavf/lavf.mxf_opatom
+tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio
index 485964529f..2b9306f1df 100644
--- a/tests/ref/lavf/mxf_opatom_audio
+++ b/tests/ref/lavf/mxf_opatom_audio
@@ -1,3 +1,3 @@
-c45bb140605339556a77e751fda2c449 *./tests/data/lavf/lavf.mxf_opatom_audio
-102969 ./tests/data/lavf/lavf.mxf_opatom_audio
-./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
+c45bb140605339556a77e751fda2c449 *tests/data/lavf/lavf.mxf_opatom_audio
+102969 tests/data/lavf/lavf.mxf_opatom_audio
+tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut
index 1c3d7107da..1ba91dfb83 100644
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@ -1,3 +1,3 @@
-424e8037d7b6f3d3c09cf76bf06a63cb *./tests/data/lavf/lavf.nut
-319958 ./tests/data/lavf/lavf.nut
-./tests/data/lavf/lavf.nut CRC=0xec6c3c68
+424e8037d7b6f3d3c09cf76bf06a63cb *tests/data/lavf/lavf.nut
+319958 tests/data/lavf/lavf.nut
+tests/data/lavf/lavf.nut CRC=0xec6c3c68
diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm
index 62e0a31739..43ea4c7897 100644
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@ -1,2 +1,2 @@
-e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm
-346424 ./tests/data/lavf/lavf.rm
+e30681d05d6f3d24108d3614600bf116 *tests/data/lavf/lavf.rm
+346424 tests/data/lavf/lavf.rm
diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg
index fb8c6542fa..537c0847cb 100644
--- a/tests/ref/lavf/smjpeg
+++ b/tests/ref/lavf/smjpeg
@@ -1,3 +1,3 @@
-3fe90213ac4f5275eb85ad0a4e4bdb44 *./tests/data/lavf/lavf.smjpeg
-728642 ./tests/data/lavf/lavf.smjpeg
-./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
+3fe90213ac4f5275eb85ad0a4e4bdb44 *tests/data/lavf/lavf.smjpeg
+728642 tests/data/lavf/lavf.smjpeg
+tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
diff --git a/tests/ref/lavf/swf b/tests/ref/lavf/swf
index 7ce0fa46cb..b4e5bb978d 100644
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@ -1,3 +1,3 @@
-11e9e9bf99a0ae6a0ba5434b745eae21 *./tests/data/lavf/lavf.swf
-329474 ./tests/data/lavf/lavf.swf
-./tests/data/lavf/lavf.swf CRC=0x4eac88c5
+11e9e9bf99a0ae6a0ba5434b745eae21 *tests/data/lavf/lavf.swf
+329474 tests/data/lavf/lavf.swf
+tests/data/lavf/lavf.swf CRC=0x4eac88c5
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index 2be3526c7c..09960f84d3 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts
-407020 ./tests/data/lavf/lavf.ts
-./tests/data/lavf/lavf.ts CRC=0x71287e25
+38f4b14d43a0e416be8d598628997cbc *tests/data/lavf/lavf.ts
+407020 tests/data/lavf/lavf.ts
+tests/data/lavf/lavf.ts CRC=0x71287e25
diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv
index 11c04c5e61..8f991818b4 100644
--- a/tests/ref/lavf/wtv
+++ b/tests/ref/lavf/wtv
@@ -1,3 +1,3 @@
-c5328b1c3e5fe70468c3f587c34ffd82 *./tests/data/lavf/lavf.wtv
-413696 ./tests/data/lavf/lavf.wtv
-./tests/data/lavf/lavf.wtv CRC=0x71287e25
+c5328b1c3e5fe70468c3f587c34ffd82 *tests/data/lavf/lavf.wtv
+413696 tests/data/lavf/lavf.wtv
+tests/data/lavf/lavf.wtv CRC=0x71287e25
diff --git a/tests/ref/seek/lavf-dv_fmt b/tests/ref/seek/lavf-dv
similarity index 100%
rename from tests/ref/seek/lavf-dv_fmt
rename to tests/ref/seek/lavf-dv
diff --git a/tests/ref/seek/lavf-flv_fmt b/tests/ref/seek/lavf-flv
similarity index 100%
rename from tests/ref/seek/lavf-flv_fmt
rename to tests/ref/seek/lavf-flv
======================================================================
diff --cc tests/fate-run.sh
index a2ccc65a63,c8ac6a1385..ebd5c14c17
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@@ -290,6 -197,15 +290,26 @@@ lavf_audio()
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
}
+ lavf_container(){
+ t="${test#lavf-}"
+ outdir="tests/data/lavf"
+ file=${outdir}/lavf.$t
- do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $2
++ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -b:a 64k -t 1 -qscale:v 10 $2
+ test $3 = "disable_crc" ||
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+ }
+
++lavf_container_attach() { lavf_container "" "$1 -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap"; }
++lavf_container_timecode_nodrop() { lavf_container "" "$1 -timecode 02:56:14:13"; }
++lavf_container_timecode_drop() { lavf_container "" "$1 -timecode 02:56:14.13 -r 30000/1001"; }
++
++lavf_container_timecode()
++{
++ lavf_container_timecode_nodrop "$@"
++ lavf_container_timecode_drop "$@"
++ lavf_container "" "$1"
++}
++
lavf_image(){
t="${test#lavf-}"
outdir="tests/data/images/$t"
diff --cc tests/fate/api.mak
index 3714f900bd,0000000000..b716b3b901
mode 100644,000000..100644
--- a/tests/fate/api.mak
+++ b/tests/fate/api.mak
@@@ -1,49 -1,0 +1,49 @@@
+FATE_API_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac
+fate-api-flac: $(APITESTSDIR)/api-flac-test$(EXESUF)
+fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test
+fate-api-flac: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-band
+fate-api-band: $(APITESTSDIR)/api-band-test$(EXESUF)
+fate-api-band: CMD = run $(APITESTSDIR)/api-band-test $(TARGET_SAMPLES)/mpeg4/resize_down-up.h263
+fate-api-band: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
+fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
+fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264-slice
+fate-api-h264-slice: $(APITESTSDIR)/api-h264-slice-test$(EXESUF)
+fate-api-h264-slice: CMD = run $(APITESTSDIR)/api-h264-slice-test 2 $(TARGET_SAMPLES)/h264/crew_cif.nal
+
+FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek
- fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv_fmt
++fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv
+fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720
+fate-api-seek: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, PNG) += fate-api-png-codec-param
+fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
+fate-api-png-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/png1/lena-rgba.png
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, MJPEG) += fate-api-mjpeg-codec-param
+fate-api-mjpeg-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
+fate-api-mjpeg-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/exif/image_small.jpg
+
+FATE_API-$(HAVE_THREADS) += fate-api-threadmessage
+fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF)
+fate-api-threadmessage: CMD = run $(APITESTSDIR)/api-threadmessage-test 3 10 30 50 2 20 40
+fate-api-threadmessage: CMP = null
+
+FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES_LIBAVFORMAT-yes)
+
+ifdef SAMPLES
+ FATE_API_SAMPLES += $(FATE_API_SAMPLES-yes)
+endif
+
+FATE_API-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes)
+FATE_API-$(CONFIG_AVFORMAT) += $(FATE_API_LIBAVFORMAT-yes)
+FATE_API = $(FATE_API-yes)
+
+FATE-yes += $(FATE_API) $(FATE_API_SAMPLES)
+
+fate-api: $(FATE_API) $(FATE_API_SAMPLES)
diff --cc tests/fate/avformat.mak
index 452edc788f,7c984e4fcd..e2f4d01dbe
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@@ -1,27 -1,4 +1,6 @@@
+FATE_LAVF-$(call ENCDEC, APNG, APNG) += apng
- FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
- FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
- FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
+FATE_LAVF-$(call ENCDEC, FITS, FITS) += fits
- FATE_LAVF-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm
- FATE_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
- FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
- FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
- FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov ismv
- FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
- FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
- FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
- FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25
- FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50
- FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
- FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
- FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
- FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
- FATE_LAVF-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg
- FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
- FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
- FATE_LAVF-$(call ENCDEC, MP2, WTV) += wtv
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
diff --cc tests/fate/lavf-container.mak
index 0000000000,e1f91f1329..2f3fd03385
mode 000000,100644..100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@@ -1,0 -1,37 +1,57 @@@
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
-FATE_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv
++FATE_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv dv_pal dv_ntsc
+ FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv
-FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
-FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
-FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
++FATE_LAVF_CONTAINER-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm
++FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf gxf_pal gxf_ntsc
++FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv mkv_attachment
++FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov mov_rtphint ismv
++FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MOV) += mp4
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
++FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf mxf_dv25 mxf_dvcpro50
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
++FATE_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom mxf_opatom_audio
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
+ FATE_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
++FATE_LAVF_CONTAINER-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg
+ FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf
+ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
++FATE_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv
+
+ FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%)
+
+ $(FATE_LAVF_CONTAINER): CMD = lavf_container
+ $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+ $(FATE_LAVF_CONTAINER): $(AREF) $(VREF)
+
+ fate-lavf-asf: CMD = lavf_container "" "-c:a mp2 -ar 44100" "-r 25"
-fate-lavf-avi fate-lavf-nut: CMD = lavf_container "" "-c:a mp2 -ar 44100"
++fate-lavf-avi fate-lavf-nut: CMD = lavf_container "" "-c:a mp2 -ar 44100 -threads 1"
+ fate-lavf-dv: CMD = lavf_container "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
++fate-lavf-dv_pal: CMD = lavf_container_timecode_nodrop "-ar 48000 -r 25 -s pal -ac 2 -f dv"
++fate-lavf-dv_ntsc: CMD = lavf_container_timecode_drop "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2 -f dv"
+ fate-lavf-flv fate-lavf-swf: CMD = lavf_container "" "-an"
-fate-lavf-gxf: CMD = lavf_container "-ar 48000" "-r 25 -s pal -ac 1"
-fate-lavf-mkv: CMD = lavf_container "" "-c:a mp2 -c:v mpeg4 -ar 44100"
-fate-lavf-mov: CMD = lavf_container "" "-c:a pcm_alaw -c:v mpeg4"
-fate-lavf-mpg: CMD = lavf_container "" "-ar 44100"
-fate-lavf-mxf: CMD = lavf_container "-ar 48000" "-bf 2 -timecode_frame_start 264363"
++fate-lavf-flm: CMD = lavf_container "" "-pix_fmt rgba"
++fate-lavf-gxf: CMD = lavf_container "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
++fate-lavf-gxf_pal: CMD = lavf_container_timecode_nodrop "-ar 48000 -r 25 -s pal -ac 1 -threads 1 -f gxf"
++fate-lavf-gxf_ntsc: CMD = lavf_container_timecode_drop "-ar 48000 -s ntsc -ac 1 -threads 1 -f gxf"
++fate-lavf-ismv: CMD = lavf_container_timecode "-an -c:v mpeg4 -threads 1"
++fate-lavf-mkv: CMD = lavf_container "" "-c:a mp2 -c:v mpeg4 -ar 44100 -threads 1"
++fate-lavf-mkv_attachment: CMD = lavf_container_attach "-c:a mp2 -c:v mpeg4 -threads 1 -f matroska"
++fate-lavf-mov: CMD = lavf_container_timecode "-movflags +faststart -c:a pcm_alaw -c:v mpeg4 -threads 1"
++fate-lavf-mov_rtphint: CMD = lavf_container "" "-movflags +rtphint -c:a pcm_alaw -c:v mpeg4 -threads 1 -f mov"
++fate-lavf-mp4: CMD = lavf_container_timecode "-c:v mpeg4 -an -threads 1"
++fate-lavf-mpg: CMD = lavf_container_timecode "-ar 44100 -threads 1"
++fate-lavf-mxf: CMD = lavf_container_timecode "-ar 48000 -bf 2 -threads 1"
+ fate-lavf-mxf_d10: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
++fate-lavf-mxf_dv25: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -c:v dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
++fate-lavf-mxf_dvcpro50: CMD = lavf_container "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -c:v dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
++fate-lavf-mxf_opatom: CMD = lavf_container "" "-s 1920x1080 -c:v dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
++fate-lavf-mxf_opatom_audio: CMD = lavf_container "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
++fate-lavf-smjpeg: CMD = lavf_container "" "-f smjpeg"
+ # The RealMedia muxer is broken.
+ fate-lavf-rm: CMD = lavf_container "" "-c:a ac3_fixed" disable_crc
-fate-lavf-ts: CMD = lavf_container "" "-mpegts_transport_stream_id 42 -ar 44100"
++fate-lavf-ts: CMD = lavf_container "" "-mpegts_transport_stream_id 42 -ar 44100 -threads 1"
++fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1"
+
+ FATE_AVCONV += $(FATE_LAVF_CONTAINER)
+ fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER)
diff --cc tests/lavf-regression.sh
index f703cb9c0e,4e346e2c07..719aac205e
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@@ -11,162 -11,6 +11,45 @@@ set -
eval do_$test=y
+ENC_OPTS="$ENC_OPTS -metadata title=lavftest"
+
+do_lavf_fate()
+{
+ file=${outfile}lavf.$1
+ input="${target_samples}/$2"
+ do_avconv $file $DEC_OPTS -i "$input" $ENC_OPTS -vcodec copy -acodec copy
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+}
+
- do_lavf()
- {
- file=${outfile}lavf.$1
- do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
- test $5 = "disable_crc" ||
- do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
- }
-
- do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
- do_lavf_timecode_drop() { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
-
- do_lavf_timecode()
- {
- do_lavf_timecode_nodrop "$@"
- do_lavf_timecode_drop "$@"
- do_lavf $1 "" "$2"
- }
-
- if [ -n "$do_avi" ] ; then
- do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
- fi
-
- if [ -n "$do_asf" ] ; then
- do_lavf asf "" "-acodec mp2 -ar 44100 -ab 64k" "-r 25"
- fi
-
- if [ -n "$do_rm" ] ; then
- file=${outfile}lavf.rm
- # The RealMedia muxer is broken.
- do_lavf rm "" "-c:a ac3_fixed" "" disable_crc
- fi
-
- if [ -n "$do_mpg" ] ; then
- do_lavf_timecode mpg "-ab 64k -ar 44100 -threads 1"
- fi
-
- if [ -n "$do_mxf" ] ; then
- do_lavf_timecode mxf "-ar 48000 -bf 2 -threads 1"
- fi
-
- if [ -n "$do_mxf_d10" ]; then
- do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
- fi
-
- if [ -n "$do_mxf_dv25" ]; then
- do_lavf mxf_dv25 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -vcodec dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
- fi
-
- if [ -n "$do_mxf_dvcpro50" ]; then
- do_lavf mxf_dvcpro50 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
- fi
-
- if [ -n "$do_mxf_opatom" ]; then
- do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
- fi
-
- if [ -n "$do_mxf_opatom_audio" ]; then
- do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
- fi
-
- if [ -n "$do_ts" ] ; then
- do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1"
- fi
-
- if [ -n "$do_swf" ] ; then
- do_lavf swf "" "-an"
- fi
-
- if [ -n "$do_ffm" ] ; then
- do_lavf ffm "" "-ar 44100 -threads 1"
- fi
-
- if [ -n "$do_flm" ] ; then
- do_lavf flm "" "-pix_fmt rgba"
- fi
-
- if [ -n "$do_flv_fmt" ] ; then
- do_lavf flv "" "-an"
- fi
-
- if [ -n "$do_mov" ] ; then
- mov_common_opt="-acodec pcm_alaw -vcodec mpeg4 -threads 1"
- do_lavf mov "" "-movflags +rtphint $mov_common_opt"
- do_lavf_timecode mov "-movflags +faststart $mov_common_opt"
- do_lavf_timecode mp4 "-vcodec mpeg4 -an -threads 1"
- fi
-
- if [ -n "$do_ismv" ] ; then
- do_lavf_timecode ismv "-an -vcodec mpeg4 -threads 1"
- fi
-
- if [ -n "$do_dv_fmt" ] ; then
- do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2"
- do_lavf_timecode_drop dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2"
- do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
- fi
-
- if [ -n "$do_gxf" ] ; then
- do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1 -threads 1"
- do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1 -threads 1"
- do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
- fi
-
- if [ -n "$do_nut" ] ; then
- do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
- fi
-
- if [ -n "$do_mkv" ] ; then
- do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
- -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
- do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100 -threads 1"
- fi
-
+if [ -n "$do_mp3" ] ; then
+do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy"
+fi
+
+if [ -n "$do_latm" ] ; then
+do_lavf_fate latm "aac/al04_44.mp4" "-acodec copy"
+fi
+
+if [ -n "$do_ogg_vp3" ] ; then
+# -idct simple causes different results on different systems
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate ogg "vp3/coeff_level64.mkv"
+fi
+
+if [ -n "$do_ogg_vp8" ] ; then
+do_lavf_fate ogv "vp8/RRSF49-short.webm" "-acodec copy"
+fi
+
+if [ -n "$do_mov_qtrle_mace6" ] ; then
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate mov "qtrle/Animation-16Greys.mov"
+fi
+
+if [ -n "$do_avi_cram" ] ; then
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate avi "cram/toon.avi"
+fi
+
- if [ -n "$do_wtv" ] ; then
- do_lavf wtv "" "-acodec mp2 -threads 1"
- fi
-
+
# streamed images
# mjpeg
#file=${outfile}lavf.mjpeg
@@@ -193,19 -25,6 +76,15 @@@ f
if [ -n "$do_yuv4mpeg" ] ; then
file=${outfile}lavf.y4m
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file -i $target_path/$file
fi
+
+if [ -n "$do_fits" ] ; then
+pix_fmts="gray gray16be gbrp gbrap gbrp16be gbrap16be"
+for pix_fmt in $pix_fmts ; do
+ file=${outfile}${pix_fmt}lavf.fits
+ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt $pix_fmt
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt $pix_fmt
+done
+fi
-
- if [ -n "$do_smjpeg" ] ; then
- do_lavf smjpeg "" "-f smjpeg"
- fi
diff --cc tests/ref/lavf/asf
index 911af72051,382b40c97d..fbcbd480d0
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@@ -1,3 -1,3 +1,3 @@@
- 76f131a5426f0ba5fc7409d1a1bbfdd7 *./tests/data/lavf/lavf.asf
- 333585 ./tests/data/lavf/lavf.asf
- ./tests/data/lavf/lavf.asf CRC=0xf6340a10
-33e857a06b2b5dedce0bf76c9973944c *tests/data/lavf/lavf.asf
-333379 tests/data/lavf/lavf.asf
++76f131a5426f0ba5fc7409d1a1bbfdd7 *tests/data/lavf/lavf.asf
++333585 tests/data/lavf/lavf.asf
+ tests/data/lavf/lavf.asf CRC=0xf6340a10
diff --cc tests/ref/lavf/avi
index dfdb392de7,2fbf91f5e7..b8c2f7a38b
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@@ -1,3 -1,3 +1,3 @@@
- ab696052289d8dfea193e4cf94a94a6f *./tests/data/lavf/lavf.avi
- 330814 ./tests/data/lavf/lavf.avi
- ./tests/data/lavf/lavf.avi CRC=0xec6c3c68
-e2e7b7ceaf038b259558f41df203ded9 *tests/data/lavf/lavf.avi
-330786 tests/data/lavf/lavf.avi
-tests/data/lavf/lavf.avi CRC=0x4c963cda
++ab696052289d8dfea193e4cf94a94a6f *tests/data/lavf/lavf.avi
++330814 tests/data/lavf/lavf.avi
++tests/data/lavf/lavf.avi CRC=0xec6c3c68
diff --cc tests/ref/lavf/dv
index 0000000000,41ace742e0..7ae4223a21
mode 000000,100644..100644
--- a/tests/ref/lavf/dv
+++ b/tests/ref/lavf/dv
@@@ -1,0 -1,3 +1,3 @@@
-eb51fbb48af28584ea5515f9f2400fcd *tests/data/lavf/lavf.dv
++2fb332aab8f2ba9c33b1b2368194392a *tests/data/lavf/lavf.dv
+ 3600000 tests/data/lavf/lavf.dv
-tests/data/lavf/lavf.dv CRC=0x0e868a82
++tests/data/lavf/lavf.dv CRC=0xbdaf7f52
diff --cc tests/ref/lavf/dv_ntsc
index 0000000000,0000000000..410b6ec254
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/dv_ntsc
@@@ -1,0 -1,0 +1,3 @@@
++5569626370c7c72d40de2c4559e32856 *tests/data/lavf/lavf.dv_ntsc
++3480000 tests/data/lavf/lavf.dv_ntsc
++tests/data/lavf/lavf.dv_ntsc CRC=0xa0088163
diff --cc tests/ref/lavf/dv_pal
index 0000000000,0000000000..93bb728c46
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/dv_pal
@@@ -1,0 -1,0 +1,3 @@@
++7830f9c6716ceb6011f865f1e521b951 *tests/data/lavf/lavf.dv_pal
++3600000 tests/data/lavf/lavf.dv_pal
++tests/data/lavf/lavf.dv_pal CRC=0xd428d3ee
diff --cc tests/ref/lavf/flm
index 59aac922ae,0000000000..15ca5ff458
mode 100644,000000..100644
--- a/tests/ref/lavf/flm
+++ b/tests/ref/lavf/flm
@@@ -1,3 -1,0 +1,3 @@@
- ef4783171ebbc38855331c9ead978322 *./tests/data/lavf/lavf.flm
- 10137636 ./tests/data/lavf/lavf.flm
- ./tests/data/lavf/lavf.flm CRC=0xcdf15757
++ef4783171ebbc38855331c9ead978322 *tests/data/lavf/lavf.flm
++10137636 tests/data/lavf/lavf.flm
++tests/data/lavf/lavf.flm CRC=0xcdf15757
diff --cc tests/ref/lavf/flv
index 0000000000,6e9f238b4f..3153472656
mode 000000,100644..100644
--- a/tests/ref/lavf/flv
+++ b/tests/ref/lavf/flv
@@@ -1,0 -1,3 +1,3 @@@
-689e8e53031a2c0793fb5b99fc6f1024 *tests/data/lavf/lavf.flv
-329521 tests/data/lavf/lavf.flv
-tests/data/lavf/lavf.flv CRC=0x881785d1
++0d229f87b3aad778074ace499359d137 *tests/data/lavf/lavf.flv
++329554 tests/data/lavf/lavf.flv
++tests/data/lavf/lavf.flv CRC=0x4eac88c5
diff --cc tests/ref/lavf/gxf
index 4dd463cd2a,6831c7da32..e8351fab86
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@@ -1,9 -1,3 +1,3 @@@
- 6ef34e8bedf699cd1601022c4a0a4910 *./tests/data/lavf/lavf.gxf
- 795876 ./tests/data/lavf/lavf.gxf
- ./tests/data/lavf/lavf.gxf CRC=0x1dbfef76
- 7780c428dde2c93a9ff04794f7168440 *./tests/data/lavf/lavf.gxf
- 794656 ./tests/data/lavf/lavf.gxf
- ./tests/data/lavf/lavf.gxf CRC=0xdcd39443
- 0638c4d073ac224608baaba16732b68f *./tests/data/lavf/lavf.gxf
- 795876 ./tests/data/lavf/lavf.gxf
- ./tests/data/lavf/lavf.gxf CRC=0x5ade0285
-bfc25e31136275aff0f9126610b8a7e4 *tests/data/lavf/lavf.gxf
-796428 tests/data/lavf/lavf.gxf
-tests/data/lavf/lavf.gxf CRC=0xd04c769f
++0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf
++795876 tests/data/lavf/lavf.gxf
++tests/data/lavf/lavf.gxf CRC=0x5ade0285
diff --cc tests/ref/lavf/gxf_ntsc
index 0000000000,0000000000..60efd80462
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/gxf_ntsc
@@@ -1,0 -1,0 +1,3 @@@
++9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc
++794660 tests/data/lavf/lavf.gxf_ntsc
++tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443
diff --cc tests/ref/lavf/gxf_pal
index 0000000000,0000000000..aefcd0ccab
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/gxf_pal
@@@ -1,0 -1,0 +1,3 @@@
++4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal
++795880 tests/data/lavf/lavf.gxf_pal
++tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76
diff --cc tests/ref/lavf/ismv
index 7b4a466096,0000000000..96dc8c1c9d
mode 100644,000000..100644
--- a/tests/ref/lavf/ismv
+++ b/tests/ref/lavf/ismv
@@@ -1,9 -1,0 +1,9 @@@
- 96053075a3f60d271131fe2d0765c267 *./tests/data/lavf/lavf.ismv
- 312542 ./tests/data/lavf/lavf.ismv
- ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
- 7022701b4c693bc4ffe1e9f96dd82a02 *./tests/data/lavf/lavf.ismv
- 321448 ./tests/data/lavf/lavf.ismv
- ./tests/data/lavf/lavf.ismv CRC=0xe8130120
- 96053075a3f60d271131fe2d0765c267 *./tests/data/lavf/lavf.ismv
- 312542 ./tests/data/lavf/lavf.ismv
- ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
++96053075a3f60d271131fe2d0765c267 *tests/data/lavf/lavf.ismv
++312542 tests/data/lavf/lavf.ismv
++tests/data/lavf/lavf.ismv CRC=0x9d9a638a
++7022701b4c693bc4ffe1e9f96dd82a02 *tests/data/lavf/lavf.ismv
++321448 tests/data/lavf/lavf.ismv
++tests/data/lavf/lavf.ismv CRC=0xe8130120
++96053075a3f60d271131fe2d0765c267 *tests/data/lavf/lavf.ismv
++312542 tests/data/lavf/lavf.ismv
++tests/data/lavf/lavf.ismv CRC=0x9d9a638a
diff --cc tests/ref/lavf/mkv
index 0083033958,1d116a9e3d..79f80f68cf
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@@ -1,6 -1,3 +1,3 @@@
- 7c8697c324e8ad79c5ea14364a6c39b8 *./tests/data/lavf/lavf.mkv
- 472759 ./tests/data/lavf/lavf.mkv
- ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
- 9767a3b526d7e56d7400164cb888990c *./tests/data/lavf/lavf.mkv
- 320603 ./tests/data/lavf/lavf.mkv
- ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
-dad336329ef85127f97e9d12a3b57a59 *tests/data/lavf/lavf.mkv
-320383 tests/data/lavf/lavf.mkv
-tests/data/lavf/lavf.mkv CRC=0x63ed3cda
++9767a3b526d7e56d7400164cb888990c *tests/data/lavf/lavf.mkv
++320603 tests/data/lavf/lavf.mkv
++tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --cc tests/ref/lavf/mkv_attachment
index 0000000000,0000000000..455a29feea
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/mkv_attachment
@@@ -1,0 -1,0 +1,3 @@@
++7c8697c324e8ad79c5ea14364a6c39b8 *tests/data/lavf/lavf.mkv_attachment
++472759 tests/data/lavf/lavf.mkv_attachment
++tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
diff --cc tests/ref/lavf/mov
index 2e1f24dfc6,965d1e0fca..62ce95d2e6
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@@ -1,21 -1,3 +1,9 @@@
- a10d50f2679df92264e1fc21cb8be630 *./tests/data/lavf/lavf.mov
- 366449 ./tests/data/lavf/lavf.mov
- ./tests/data/lavf/lavf.mov CRC=0xbb2b949b
- 6258f70f974e3c802e01d02ac33c7bbd *./tests/data/lavf/lavf.mov
- 357539 ./tests/data/lavf/lavf.mov
- ./tests/data/lavf/lavf.mov CRC=0xbb2b949b
- ba3b8b49e420510a0d417400dbedfc2d *./tests/data/lavf/lavf.mov
- 366621 ./tests/data/lavf/lavf.mov
- ./tests/data/lavf/lavf.mov CRC=0xa9793231
- fd0e4de8e7f6d0c8c0681d7020f00f50 *./tests/data/lavf/lavf.mov
- 356921 ./tests/data/lavf/lavf.mov
- ./tests/data/lavf/lavf.mov CRC=0xbb2b949b
- ebca72c186a4f3ba9bb17d9cb5b74fef *./tests/data/lavf/lavf.mp4
- 312457 ./tests/data/lavf/lavf.mp4
- ./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
- 9944512475d82d2d601f3c96101bdf9c *./tests/data/lavf/lavf.mp4
- 321343 ./tests/data/lavf/lavf.mp4
- ./tests/data/lavf/lavf.mp4 CRC=0xe8130120
- 7b3e71f294901067046c09f03a426bdc *./tests/data/lavf/lavf.mp4
- 312001 ./tests/data/lavf/lavf.mp4
- ./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
-e46f42ed71a589ac356e9cfad4e1e56a *tests/data/lavf/lavf.mov
-356797 tests/data/lavf/lavf.mov
-tests/data/lavf/lavf.mov CRC=0xe3f4950d
++6258f70f974e3c802e01d02ac33c7bbd *tests/data/lavf/lavf.mov
++357539 tests/data/lavf/lavf.mov
++tests/data/lavf/lavf.mov CRC=0xbb2b949b
++ba3b8b49e420510a0d417400dbedfc2d *tests/data/lavf/lavf.mov
++366621 tests/data/lavf/lavf.mov
++tests/data/lavf/lavf.mov CRC=0xa9793231
++fd0e4de8e7f6d0c8c0681d7020f00f50 *tests/data/lavf/lavf.mov
++356921 tests/data/lavf/lavf.mov
++tests/data/lavf/lavf.mov CRC=0xbb2b949b
diff --cc tests/ref/lavf/mov_rtphint
index 0000000000,0000000000..857116a261
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/mov_rtphint
@@@ -1,0 -1,0 +1,3 @@@
++a10d50f2679df92264e1fc21cb8be630 *tests/data/lavf/lavf.mov_rtphint
++366449 tests/data/lavf/lavf.mov_rtphint
++tests/data/lavf/lavf.mov_rtphint CRC=0xbb2b949b
diff --cc tests/ref/lavf/mp4
index 0000000000,0000000000..8482812380
new file mode 100644
--- /dev/null
+++ b/tests/ref/lavf/mp4
@@@ -1,0 -1,0 +1,9 @@@
++ebca72c186a4f3ba9bb17d9cb5b74fef *tests/data/lavf/lavf.mp4
++312457 tests/data/lavf/lavf.mp4
++tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
++9944512475d82d2d601f3c96101bdf9c *tests/data/lavf/lavf.mp4
++321343 tests/data/lavf/lavf.mp4
++tests/data/lavf/lavf.mp4 CRC=0xe8130120
++7b3e71f294901067046c09f03a426bdc *tests/data/lavf/lavf.mp4
++312001 tests/data/lavf/lavf.mp4
++tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
diff --cc tests/ref/lavf/mpg
index 7aab14f84b,3ccb70f6b7..332b7114b5
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@@ -1,9 -1,3 +1,9 @@@
- 01bbdea588da51ab4a9d1d26f3443c96 *./tests/data/lavf/lavf.mpg
- 372736 ./tests/data/lavf/lavf.mpg
- ./tests/data/lavf/lavf.mpg CRC=0x000e23ae
- 87b447b78a7d1141b9d41bb3aa50434d *./tests/data/lavf/lavf.mpg
- 389120 ./tests/data/lavf/lavf.mpg
- ./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
- 284f41c914df75c12de01e223d65f87f *./tests/data/lavf/lavf.mpg
- 372736 ./tests/data/lavf/lavf.mpg
- ./tests/data/lavf/lavf.mpg CRC=0x000e23ae
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *tests/data/lavf/lavf.mpg
++01bbdea588da51ab4a9d1d26f3443c96 *tests/data/lavf/lavf.mpg
+ 372736 tests/data/lavf/lavf.mpg
-tests/data/lavf/lavf.mpg CRC=0xdd24439e
++tests/data/lavf/lavf.mpg CRC=0x000e23ae
++87b447b78a7d1141b9d41bb3aa50434d *tests/data/lavf/lavf.mpg
++389120 tests/data/lavf/lavf.mpg
++tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
++284f41c914df75c12de01e223d65f87f *tests/data/lavf/lavf.mpg
++372736 tests/data/lavf/lavf.mpg
++tests/data/lavf/lavf.mpg CRC=0x000e23ae
diff --cc tests/ref/lavf/mxf
index 4466685a2d,07486a18e3..471fc5518e
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@@ -1,9 -1,3 +1,9 @@@
- 649009e3d3d62eb3b6c56334d057cc4d *./tests/data/lavf/lavf.mxf
- 526393 ./tests/data/lavf/lavf.mxf
- ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
- 9076b7015cffe8aa72883e900a2041a5 *./tests/data/lavf/lavf.mxf
- 561721 ./tests/data/lavf/lavf.mxf
- ./tests/data/lavf/lavf.mxf CRC=0x96ff1b48
- 02bf8f0cd8951a49e277306691cb1538 *./tests/data/lavf/lavf.mxf
- 526393 ./tests/data/lavf/lavf.mxf
- ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
-7c9efc1b6f5fc65bf39177887512fefd *tests/data/lavf/lavf.mxf
-525881 tests/data/lavf/lavf.mxf
-tests/data/lavf/lavf.mxf CRC=0x773f059a
++649009e3d3d62eb3b6c56334d057cc4d *tests/data/lavf/lavf.mxf
++526393 tests/data/lavf/lavf.mxf
++tests/data/lavf/lavf.mxf CRC=0x8dddfaab
++9076b7015cffe8aa72883e900a2041a5 *tests/data/lavf/lavf.mxf
++561721 tests/data/lavf/lavf.mxf
++tests/data/lavf/lavf.mxf CRC=0x96ff1b48
++02bf8f0cd8951a49e277306691cb1538 *tests/data/lavf/lavf.mxf
++526393 tests/data/lavf/lavf.mxf
++tests/data/lavf/lavf.mxf CRC=0x8dddfaab
diff --cc tests/ref/lavf/mxf_d10
index 856fe9c3e9,ffecbee89c..aea469bb58
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@@ -1,3 -1,3 +1,3 @@@
- e597f73ef9c9819710d2f815813eb91f *./tests/data/lavf/lavf.mxf_d10
- 5332013 ./tests/data/lavf/lavf.mxf_d10
- ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
-5fbb6252f6b146cd36d1491ca96ad8a3 *tests/data/lavf/lavf.mxf_d10
-5330989 tests/data/lavf/lavf.mxf_d10
-tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480
++e597f73ef9c9819710d2f815813eb91f *tests/data/lavf/lavf.mxf_d10
++5332013 tests/data/lavf/lavf.mxf_d10
++tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
diff --cc tests/ref/lavf/mxf_dv25
index e94b3ca1ca,0000000000..db6b76c6f8
mode 100644,000000..100644
--- a/tests/ref/lavf/mxf_dv25
+++ b/tests/ref/lavf/mxf_dv25
@@@ -1,3 -1,0 +1,3 @@@
- 0fc964fa22bc8b3a389b81b9a2efccb3 *./tests/data/lavf/lavf.mxf_dv25
- 3834413 ./tests/data/lavf/lavf.mxf_dv25
- ./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
++0fc964fa22bc8b3a389b81b9a2efccb3 *tests/data/lavf/lavf.mxf_dv25
++3834413 tests/data/lavf/lavf.mxf_dv25
++tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
diff --cc tests/ref/lavf/mxf_dvcpro50
index 514a0475c9,0000000000..09999914bf
mode 100644,000000..100644
--- a/tests/ref/lavf/mxf_dvcpro50
+++ b/tests/ref/lavf/mxf_dvcpro50
@@@ -1,3 -1,0 +1,3 @@@
- aa81ea83af44a69e73849e327cc4bd12 *./tests/data/lavf/lavf.mxf_dvcpro50
- 7431213 ./tests/data/lavf/lavf.mxf_dvcpro50
- ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
++aa81ea83af44a69e73849e327cc4bd12 *tests/data/lavf/lavf.mxf_dvcpro50
++7431213 tests/data/lavf/lavf.mxf_dvcpro50
++tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
diff --cc tests/ref/lavf/mxf_opatom
index cc4eb519ea,0000000000..05794a4e5e
mode 100644,000000..100644
--- a/tests/ref/lavf/mxf_opatom
+++ b/tests/ref/lavf/mxf_opatom
@@@ -1,3 -1,0 +1,3 @@@
- 06a1816aa91c733e1ef7e45d82e4f1d3 *./tests/data/lavf/lavf.mxf_opatom
- 4717625 ./tests/data/lavf/lavf.mxf_opatom
- ./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
++06a1816aa91c733e1ef7e45d82e4f1d3 *tests/data/lavf/lavf.mxf_opatom
++4717625 tests/data/lavf/lavf.mxf_opatom
++tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
diff --cc tests/ref/lavf/mxf_opatom_audio
index 485964529f,0000000000..2b9306f1df
mode 100644,000000..100644
--- a/tests/ref/lavf/mxf_opatom_audio
+++ b/tests/ref/lavf/mxf_opatom_audio
@@@ -1,3 -1,0 +1,3 @@@
- c45bb140605339556a77e751fda2c449 *./tests/data/lavf/lavf.mxf_opatom_audio
- 102969 ./tests/data/lavf/lavf.mxf_opatom_audio
- ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
++c45bb140605339556a77e751fda2c449 *tests/data/lavf/lavf.mxf_opatom_audio
++102969 tests/data/lavf/lavf.mxf_opatom_audio
++tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
diff --cc tests/ref/lavf/nut
index 1c3d7107da,6be1ec4499..1ba91dfb83
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@@ -1,3 -1,3 +1,3 @@@
- 424e8037d7b6f3d3c09cf76bf06a63cb *./tests/data/lavf/lavf.nut
- 319958 ./tests/data/lavf/lavf.nut
- ./tests/data/lavf/lavf.nut CRC=0xec6c3c68
-d685d5af89cfddb2660f03b1dee3f9a2 *tests/data/lavf/lavf.nut
-319711 tests/data/lavf/lavf.nut
-tests/data/lavf/lavf.nut CRC=0x4c963cda
++424e8037d7b6f3d3c09cf76bf06a63cb *tests/data/lavf/lavf.nut
++319958 tests/data/lavf/lavf.nut
++tests/data/lavf/lavf.nut CRC=0xec6c3c68
diff --cc tests/ref/lavf/rm
index 62e0a31739,7d317448e0..43ea4c7897
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@@ -1,2 -1,2 +1,2 @@@
- e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm
- 346424 ./tests/data/lavf/lavf.rm
-9eeb3b91c0a45f519fd7f2efea882cf4 *tests/data/lavf/lavf.rm
-346414 tests/data/lavf/lavf.rm
++e30681d05d6f3d24108d3614600bf116 *tests/data/lavf/lavf.rm
++346424 tests/data/lavf/lavf.rm
diff --cc tests/ref/lavf/smjpeg
index fb8c6542fa,0000000000..537c0847cb
mode 100644,000000..100644
--- a/tests/ref/lavf/smjpeg
+++ b/tests/ref/lavf/smjpeg
@@@ -1,3 -1,0 +1,3 @@@
- 3fe90213ac4f5275eb85ad0a4e4bdb44 *./tests/data/lavf/lavf.smjpeg
- 728642 ./tests/data/lavf/lavf.smjpeg
- ./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
++3fe90213ac4f5275eb85ad0a4e4bdb44 *tests/data/lavf/lavf.smjpeg
++728642 tests/data/lavf/lavf.smjpeg
++tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
diff --cc tests/ref/lavf/swf
index 7ce0fa46cb,cfb2a6a434..b4e5bb978d
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@@ -1,3 -1,3 +1,3 @@@
- 11e9e9bf99a0ae6a0ba5434b745eae21 *./tests/data/lavf/lavf.swf
- 329474 ./tests/data/lavf/lavf.swf
- ./tests/data/lavf/lavf.swf CRC=0x4eac88c5
-62c5aeb636fc82cf6ba6277d36e42cb5 *tests/data/lavf/lavf.swf
-329479 tests/data/lavf/lavf.swf
-tests/data/lavf/lavf.swf CRC=0x881785d1
++11e9e9bf99a0ae6a0ba5434b745eae21 *tests/data/lavf/lavf.swf
++329474 tests/data/lavf/lavf.swf
++tests/data/lavf/lavf.swf CRC=0x4eac88c5
diff --cc tests/ref/lavf/ts
index 2be3526c7c,a51831a66e..09960f84d3
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@@ -1,3 -1,3 +1,3 @@@
- 38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts
- 407020 ./tests/data/lavf/lavf.ts
- ./tests/data/lavf/lavf.ts CRC=0x71287e25
-7a479525b7dc9264291cb2fc3e1d28e5 *tests/data/lavf/lavf.ts
-406456 tests/data/lavf/lavf.ts
-tests/data/lavf/lavf.ts CRC=0xb4ca6cdc
++38f4b14d43a0e416be8d598628997cbc *tests/data/lavf/lavf.ts
++407020 tests/data/lavf/lavf.ts
++tests/data/lavf/lavf.ts CRC=0x71287e25
diff --cc tests/ref/lavf/wtv
index 11c04c5e61,0000000000..8f991818b4
mode 100644,000000..100644
--- a/tests/ref/lavf/wtv
+++ b/tests/ref/lavf/wtv
@@@ -1,3 -1,0 +1,3 @@@
- c5328b1c3e5fe70468c3f587c34ffd82 *./tests/data/lavf/lavf.wtv
- 413696 ./tests/data/lavf/lavf.wtv
- ./tests/data/lavf/lavf.wtv CRC=0x71287e25
++c5328b1c3e5fe70468c3f587c34ffd82 *tests/data/lavf/lavf.wtv
++413696 tests/data/lavf/lavf.wtv
++tests/data/lavf/lavf.wtv CRC=0x71287e25
More information about the ffmpeg-cvslog
mailing list