[FFmpeg-cvslog] Merge commit '3aa9d37d03da3c9b482d19b3988659287815280e'

Clément Bœsch git at videolan.org
Mon Mar 20 12:02:19 EET 2017 

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 11:00:07 2017 +0100| [38343651a82f42de8f30b6f0028c9dfe241134d8] | committer: Clément Bœsch

Merge commit '3aa9d37d03da3c9b482d19b3988659287815280e'

* commit '3aa9d37d03da3c9b482d19b3988659287815280e':
  build: Fix directory dependencies of tests/pixfmts.mak target

This might not be necessary given our mkdirs in the configure, but it
probably doesn't hurt.

Merged-by: Clément Bœsch <u at pkh.me>

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

 tests/fate/filter-video.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 97c5e6c..551cee4 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -538,7 +538,7 @@ fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2"
 
 
 tests/pixfmts.mak: TAG = GEN
-tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF)
+tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF) | tests
 	$(M)printf "PIXFMTS = " > $@
 	$(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
 	$(Q)printf "\n" >> $@


======================================================================

diff --cc tests/fate/filter-video.mak
index 97c5e6c,82d0a62..551cee4
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@@ -422,123 -115,9 +422,123 @@@ fate-filter-vflip_crop: CMD = video_fil
  FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip
  fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip"
  
 +FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect
 +fate-filter-edgedetect: CMD = video_filter "format=gray,perms=random,edgedetect" -vframes 20
 +
 +FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect-colormix
 +fate-filter-edgedetect-colormix: CMD = video_filter "format=gbrp,perms=random,edgedetect=mode=colormix" -vframes 20
 +
 +FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue
 +fate-filter-hue: CMD = video_filter "perms=random,hue=s=sin(2*PI*t)+1" -vframes 20
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_IDET_FILTER) += fate-filter-idet
 +fate-filter-idet: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf idet -vframes 25 -flags +bitexact
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_PAD_FILTER) += fate-filter-pad
 +fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2"
 +
 +FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6
 +FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP)
 +$(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd
 +
 +fate-filter-pp:  CMD = framecrc -flags bitexact -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -vframes 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al"
 +fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al"
 +fate-filter-pp2: CMD = video_filter "qp=x+y,pp=be/h1/v1/lb"
 +fate-filter-pp3: CMD = video_filter "qp=x+y,pp=be/ha|128|7/va/li"
 +fate-filter-pp4: CMD = video_filter "pp=be/ci"
 +fate-filter-pp5: CMD = video_filter "pp=md"
 +fate-filter-pp6: CMD = video_filter "pp=be/fd"
 +
 +FATE_FILTER_VSYNTH-$(call ALLYES, QP_FILTER PP_FILTER) += fate-filter-qp
 +fate-filter-qp: CMD = video_filter "qp=17,pp=be/hb/vb/tn/l5/al"
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select
 +fate-filter-select: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))" -vframes 25 -flags +bitexact
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_SETDAR_FILTER) += fate-filter-setdar
 +fate-filter-setdar: CMD = video_filter "setdar=dar=16/9"
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar
 +fate-filter-setsar: CMD = video_filter "setsar=sar=16/11"
 +
 +FATE_STEREO3D += fate-filter-stereo3d-al-sbsl
 +fate-filter-stereo3d-al-sbsl: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=al:sbsl
 +
 +FATE_STEREO3D += fate-filter-stereo3d-ar-abl
 +fate-filter-stereo3d-ar-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=ar:abl
 +
 +FATE_STEREO3D += fate-filter-stereo3d-abr-mr
 +fate-filter-stereo3d-abr-mr: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=abr:mr
 +
 +FATE_STEREO3D += fate-filter-stereo3d-abr-ml
 +fate-filter-stereo3d-abr-ml: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=abr:ml
 +
 +FATE_STEREO3D  += fate-filter-stereo3d-sbsl-abl
 +fate-filter-stereo3d-sbsl-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:abl
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-abr
 +fate-filter-stereo3d-sbsl-abr: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:abr
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-al
 +fate-filter-stereo3d-sbsl-al: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:al
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-sbsr
 +fate-filter-stereo3d-sbsl-sbsr: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:sbsr
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmc
 +fate-filter-stereo3d-sbsl-agmc: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmc
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmd
 +fate-filter-stereo3d-sbsl-agmd: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmd
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmg
 +fate-filter-stereo3d-sbsl-agmg: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmg
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmh
 +fate-filter-stereo3d-sbsl-agmh: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmh
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-arbg
 +fate-filter-stereo3d-sbsl-arbg: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arbg
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcc
 +fate-filter-stereo3d-sbsl-arcc: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcc
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcd
 +fate-filter-stereo3d-sbsl-arcd: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcd
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcg
 +fate-filter-stereo3d-sbsl-arcg: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcg
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-arch
 +fate-filter-stereo3d-sbsl-arch: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arch
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-argg
 +fate-filter-stereo3d-sbsl-argg: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:argg
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybc
 +fate-filter-stereo3d-sbsl-aybc: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybc
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybd
 +fate-filter-stereo3d-sbsl-aybd: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybd
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybg
 +fate-filter-stereo3d-sbsl-aybg: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybg
 +
 +FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybh
 +fate-filter-stereo3d-sbsl-aybh: CMD = framecrc -c:v pgmyuv -i $(SRC) -vframes 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybh
 +
 +fate-filter-stereo3d: $(FATE_STEREO3D)
 +FATE_FILTER_VSYNTH-$(CONFIG_STEREO3D_FILTER) += $(FATE_STEREO3D)
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_THUMBNAIL_FILTER) += fate-filter-thumbnail
 +fate-filter-thumbnail: CMD = video_filter "thumbnail=10"
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_TILE_FILTER) += fate-filter-tile
 +fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2"
 +
  
  tests/pixfmts.mak: TAG = GEN
- tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF)
 -tests/pixfmts.mak: avconv$(EXESUF) | tests
++tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF) | tests
  	$(M)printf "PIXFMTS = " > $@
  	$(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
  	$(Q)printf "\n" >> $@

More information about the ffmpeg-cvslog mailing list