[FFmpeg-cvslog] configure: remove libdl dependency from libndi_newtek

2017-10-11 Thread Marton Balint 
ffmpeg | branch: master | Marton Balint  | Tue Oct 10 23:30:29 
2017 +0200| [58143b15adda6391ec07f3eb19e80ed91d801edd] | committer: Marton 
Balint

configure: remove libdl dependency from libndi_newtek

We are not using dynamic loading for libndi.

Reviewed-by: James Almer 
Signed-off-by: Marton Balint 

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

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e2ef54fb3b..259619cccd 100755
--- a/configure
+++ b/configure
@@ -3089,9 +3089,9 @@ decklink_indev_deps="decklink threads"
 decklink_indev_extralibs="-lstdc++"
 decklink_outdev_deps="decklink threads"
 decklink_outdev_extralibs="-lstdc++"
-libndi_newtek_indev_deps="libndi_newtek libdl"
+libndi_newtek_indev_deps="libndi_newtek"
 libndi_newtek_indev_extralibs="-lndi"
-libndi_newtek_outdev_deps="libndi_newtek libdl"
+libndi_newtek_outdev_deps="libndi_newtek"
 libndi_newtek_outdev_extralibs="-lndi"
 dshow_indev_deps="IBaseFilter"
 dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: remove libdl dependency from libndi_newtek

2017-10-11 Thread Marton Balint 
ffmpeg | branch: release/3.4 | Marton Balint  | Tue Oct 10 
23:30:29 2017 +0200| [c8642473e0b3d2c2d644c72eb7e4de23fa3f79fa] | committer: 
Marton Balint

configure: remove libdl dependency from libndi_newtek

We are not using dynamic loading for libndi.

Reviewed-by: James Almer 
Signed-off-by: Marton Balint 
(cherry picked from commit 58143b15adda6391ec07f3eb19e80ed91d801edd)

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

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e2ef54fb3b..259619cccd 100755
--- a/configure
+++ b/configure
@@ -3089,9 +3089,9 @@ decklink_indev_deps="decklink threads"
 decklink_indev_extralibs="-lstdc++"
 decklink_outdev_deps="decklink threads"
 decklink_outdev_extralibs="-lstdc++"
-libndi_newtek_indev_deps="libndi_newtek libdl"
+libndi_newtek_indev_deps="libndi_newtek"
 libndi_newtek_indev_extralibs="-lndi"
-libndi_newtek_outdev_deps="libndi_newtek libdl"
+libndi_newtek_outdev_deps="libndi_newtek"
 libndi_newtek_outdev_extralibs="-lndi"
 dshow_indev_deps="IBaseFilter"
 dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] build: Fine-grained link-time dependency settings

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Sun Jan 22 
16:42:36 2017 +0100| [7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63] | committer: 
Diego Biurrun

build: Fine-grained link-time dependency settings

Previously, all link-time dependencies were added for all libraries,
resulting in bogus link-time dependencies since not all dependencies
are shared across libraries. Also, in some cases like libavutil, not
all dependencies were taken into account, resulting in some cases of
underlinking.

To address all this mess a machinery is added for tracking which
dependency belongs to which library component and then leveraged
to determine correct dependencies for all individual libraries.

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

 Makefile|   2 +-
 avbuild/common.mak  |   2 +-
 avbuild/library.mak |   2 +-
 configure   | 156 +++-
 tests/checkasm/Makefile |   2 +-
 5 files changed, 119 insertions(+), 45 deletions(-)

diff --git a/Makefile b/Makefile
index a3cd0846e1..80d50d8253 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ FF_DEP_LIBS  := $(DEP_LIBS)
 FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
 
 $(TOOLS): %$(EXESUF): %.o
-   $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS) $(ELIBS)
+   $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) 
$(EXTRALIBS) $(ELIBS)
 
 CONFIGURABLE_COMPONENTS =   \
 $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \
diff --git a/avbuild/common.mak b/avbuild/common.mak
index 236380effc..a627dc0ccf 100644
--- a/avbuild/common.mak
+++ b/avbuild/common.mak
@@ -8,7 +8,7 @@ OBJS  += $(OBJS-yes)
 FFLIBS:= $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)
 
-FFEXTRALIBS := $(FFLIBS:%=$(LD_LIB)) $(EXTRALIBS)
+FFEXTRALIBS := $(FFLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) 
$(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
 
 OBJS  := $(sort $(OBJS:%=$(SUBDIR)%))
 TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
diff --git a/avbuild/library.mak b/avbuild/library.mak
index e5f6d7d288..be6098c9ff 100644
--- a/avbuild/library.mak
+++ b/avbuild/library.mak
@@ -30,7 +30,7 @@ $(TOOLS): THISLIB = $(NAME:%=$(LD_LIB))
 $(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
 
 $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
-   $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) 
$(FFEXTRALIBS) $$(ELIBS)
+   $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) 
$(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS)
 
 $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
$$(M) $$(SRC_PATH)/avbuild/libversion.sh $(NAME) $$< > $$@
diff --git a/configure b/configure
index 85ce5f581f..5af7df3057 100755
--- a/configure
+++ b/configure
@@ -610,7 +610,7 @@ is_in(){
 return 1
 }
 
-do_check_deps(){
+check_deps(){
 for cfg; do
 enabled ${cfg}_checking && die "Circular dependency for $cfg."
 disabled ${cfg}_checking && continue
@@ -626,7 +626,7 @@ do_check_deps(){
 eval dep_ifn="\$${cfg}_if_any"
 
 pushvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
-do_check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa 
$dep_ifn
+check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa 
$dep_ifn
 popvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
 
 [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
@@ -639,24 +639,17 @@ do_check_deps(){
 if enabled $cfg; then
 enable_deep $dep_sel
 enable_deep_weak $dep_sgs
+for dep in $dep_all $dep_any $dep_sgs; do
+# filter out library deps, these do not belong in extralibs
+is_in $dep $LIBRARY_LIST && continue
+enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs
+done
 fi
 
 disable ${cfg}_checking
 done
 }
 
-check_deps(){
-unset allopts
-
-do_check_deps "$@"
-
-for cfg in $allopts; do
-enabled $cfg || continue
-eval dep_extralibs="\$${cfg}_extralibs"
-test -n "$dep_extralibs" && add_extralibs $dep_extralibs
-done
-}
-
 print_config(){
 pfx=$1
 files=$2
@@ -711,6 +704,15 @@ unique(){
 eval "$var=\"${uniq_list}\""
 }
 
+resolve(){
+var=$1
+tmpvar=
+for entry in $(eval echo \$$var); do
+tmpvar="$tmpvar $(eval echo \$${entry})"
+done
+eval "$var=\"${tmpvar}\""
+}
+
 add_cppflags(){
 append CPPFLAGS "$@"
 }
@@ -1015,7 +1017,7 @@ check_lib(){
 shift 3
 disable $name
 check_func_headers "$headers" "$funcs" "$@" &&
-enable $name && add_extralibs "$@"
+enable $name && eval ${name}_extralibs="\$@"
 }
 
 check_pkg_config(){
@@ -1033,7 +1035,7 @@ check_pkg_config(){
 check_func_headers "$headers"

[FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 17:55:25 
2017 -0300| [6dfcbd80ad446ff163b47f2bf432bbf706436ea8] | committer: James Almer

Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

* commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63':
  build: Fine-grained link-time dependency settings

Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870,
d9da7151eef7fc469787e7298196cea291acfd82 and
5e27ef800bfa2be17a6353ddedac6b7400e4624f.

Merged-by: James Almer 

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

 Makefile|   3 +-
 configure   | 297 +---
 ffbuild/common.mak  |   2 +-
 ffbuild/library.mak |   2 +-
 tests/checkasm/Makefile |   2 +-
 5 files changed, 187 insertions(+), 119 deletions(-)

diff --git a/Makefile b/Makefile
index 642651d4cc..f964a770e6 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,11 @@ FF_DEP_LIBS  := $(DEP_LIBS)
 FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
 
 $(TOOLS): %$(EXESUF): %.o
-   $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
+   $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) 
$(EXTRALIBS) $(ELIBS)
 
 target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) 
$(LIBFUZZER_PATH)
 
-tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
 tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
 tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
diff --git a/configure b/configure
index 259619cccd..dfbc251bb2 100755
--- a/configure
+++ b/configure
@@ -732,12 +732,11 @@ is_in(){
 return 1
 }
 
-do_check_deps(){
+check_deps(){
 for cfg; do
 enabled ${cfg}_checking && die "Circular dependency for $cfg."
 disabled ${cfg}_checking && continue
 enable ${cfg}_checking
-append allopts $cfg
 
 eval dep_all="\$${cfg}_deps"
 eval dep_any="\$${cfg}_deps_any"
@@ -748,7 +747,7 @@ do_check_deps(){
 eval dep_ifn="\$${cfg}_if_any"
 
 pushvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
-do_check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa 
$dep_ifn
+check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa 
$dep_ifn
 popvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
 
 [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
@@ -758,24 +757,15 @@ do_check_deps(){
 disabled_all $dep_con || { disable $cfg && requested $cfg && die 
"ERROR: $cfg requested, but some conflicting dependencies are unsatisfied: 
$dep_con"; }
 disabled_any $dep_sel && { disable $cfg && requested $cfg && die 
"ERROR: $cfg requested, but some selected dependency is unsatisfied: $dep_sel"; 
}
 
-if enabled $cfg; then
-enable_deep $dep_sel
-enable_deep_weak $dep_sgs
-fi
+enabled $cfg && enable_deep_weak $dep_sel $dep_sgs
 
-disable ${cfg}_checking
-done
-}
-
-check_deps(){
-unset allopts
-
-do_check_deps "$@"
+for dep in $dep_all $dep_any $dep_sel $dep_sgs; do
+# filter out library deps, these do not belong in extralibs
+is_in $dep $LIBRARY_LIST && continue
+enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs
+done
 
-for cfg in $allopts; do
-enabled $cfg || continue
-eval dep_extralibs="\$${cfg}_extralibs"
-test -n "$dep_extralibs" && add_extralibs $dep_extralibs
+disable ${cfg}_checking
 done
 }
 
@@ -839,6 +829,15 @@ unique(){
 eval "$var=\"${uniq_list}\""
 }
 
+resolve(){
+var=$1
+tmpvar=
+for entry in $(eval echo \$$var); do
+tmpvar="$tmpvar $(eval echo \$${entry})"
+done
+eval "$var=\"${tmpvar}\""
+}
+
 add_cppflags(){
 append CPPFLAGS "$@"
 }
@@ -1135,7 +1134,8 @@ check_apple_framework(){
 name="$(tolower $framework)"
 header="${framework}/${framework}.h"
 disable $name
-check_header_objcc $header && enable $name && add_extralibs "-framework 
$framework"
+check_header_objcc $header &&
+enable $name && eval ${name}_extralibs='"-framework $framework"'
 }
 
 check_func(){
@@ -1255,15 +1255,18 @@ check_lib(){
 shift 3
 disable $name
 check_func_headers "$headers" "$funcs" "$@" &&
-enable $name && add_extralibs "$@"
+enable $name && eval ${name}_extralibs="\$@"
 }
 
 check_lib_cpp(){
 log check_lib_cpp "$@"
-headers="$1"
-classes="$2"
-shift 2
-check_class_headers_cpp "$headers" "$classes" "$@" && add_extralibs "$@"
+name="$1"
+headers="$2"
+classes="$3"
+shift 3
+disable $name
+check_class_headers_cpp "$headers" "$classes" "$@" &&
+enable $name && eval ${name}_extralibs="\$@"
 }
 
 check_pkg_config(){
@@ -1280,8 +1283,8 @@ check_pkg_co

[FFmpeg-cvslog] x86: hevc: Add missing colons after assembly labels

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Tue Feb 28 
18:35:10 2017 +0100| [fde7ee8710e9278af29e1e17f7023bb84a837573] | committer: 
Diego Biurrun

x86: hevc: Add missing colons after assembly labels

This fixes several warnings of the sort
warning: label alone on a line without a colon might be in error

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

 libavcodec/x86/hevc_add_res.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/hevc_add_res.asm b/libavcodec/x86/hevc_add_res.asm
index 66b929c594..4701e9d45d 100644
--- a/libavcodec/x86/hevc_add_res.asm
+++ b/libavcodec/x86/hevc_add_res.asm
@@ -330,7 +330,7 @@ cglobal hevc_add_residual_32_10, 3, 5, 6
 mova  m5, [max_pixels_10]
 
 mov  r4d, 32
-.loop
+.loop:
 ADD_RES_SSE_32_10 r0, r1
 lea   r0, [r0+r2]
 add   r1, 64
@@ -346,7 +346,7 @@ cglobal hevc_add_residual_16_10, 3, 5, 6
 lear3, [r2*3]
 
 mov   r4d, 4
-.loop
+.loop:
 ADD_RES_AVX2_16_10 r0, r2, r3, r1
 lear0, [r0+r2*4]
 addr1, 128
@@ -359,7 +359,7 @@ cglobal hevc_add_residual_32_10, 3, 5, 6
 mova   m5, [max_pixels_10]
 
 mov   r4d, 16
-.loop
+.loop:
 ADD_RES_AVX2_32_10 r0, r2, r1
 lear0, [r0+r2*2]
 addr1, 128

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: Fix typo in objcc default setting

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Tue Feb 28 
19:01:28 2017 +0100| [58407b4d74c99e30dbd40fe468c69dbd25ea4255] | committer: 
Diego Biurrun

configure: Fix typo in objcc default setting

Also drop stray duplicate OBJCC config.mak entry.

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

 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure b/configure
index 5af7df3057..d3921da31c 100755
--- a/configure
+++ b/configure
@@ -2991,7 +2991,7 @@ fi
 
 ar_default="${cross_prefix}${ar_default}"
 cc_default="${cross_prefix}${cc_default}"
-occ_default="${cross_prefix}${occ_default}"
+objcc_default="${cross_prefix}${objcc_default}"
 nm_default="${cross_prefix}${nm_default}"
 pkg_config_default="${cross_prefix}${pkg_config_default}"
 ranlib="${cross_prefix}${ranlib}"
@@ -5321,7 +5321,6 @@ CC_IDENT=$cc_ident
 ARCH=$arch
 INTRINSICS=$intrinsics
 CC=$cc
-OBJCC=$cc
 AS=$as
 OBJCC=$objcc
 LD=$ld

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 18:32:30 
2017 -0300| [9244524177b568d0da8f26cb88ab338b2ca6e475] | committer: James Almer

Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'

* commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255':
  configure: Fix typo in objcc default setting
  x86: hevc: Add missing colons after assembly labels

This commit is a noop.

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 18:33:50 
2017 -0300| [f6a959adff30699919634b777d5b4640a2721f26] | committer: James Almer

Merge commit '4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e'

* commit '4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e':
  build: Skip generating .version files when cleaning

This commit is a noop, see cbe181c8e1611aaee2a85ab522e17b1322bdd4de

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] build: Skip generating .version files when cleaning

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Tue Feb 28 
22:12:18 2017 +0100| [4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e] | committer: 
Diego Biurrun

build: Skip generating .version files when cleaning

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

 avbuild/library.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/avbuild/library.mak b/avbuild/library.mak
index be6098c9ff..227e4d5d48 100644
--- a/avbuild/library.mak
+++ b/avbuild/library.mak
@@ -1,6 +1,8 @@
 include $(SRC_PATH)/avbuild/common.mak
 
+ifeq (,$(filter %clean,$(MAKECMDGOALS)))
 -include $(SUBDIR)lib$(NAME).version
+endif
 
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] build: Add "build" shorthand target that depends on all compile targets

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Tue Feb 28 
22:11:39 2017 +0100| [d1d6230ea3dd2c34bcd121f958706f3177f8d8c5] | committer: 
Diego Biurrun

build: Add "build" shorthand target that depends on all compile targets

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

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 80d50d8253..dc4b0add9f 100644
--- a/Makefile
+++ b/Makefile
@@ -179,6 +179,7 @@ distclean::
 config:
$(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
 
+build: all alltools checkheaders examples testprogs
 check: all alltools checkheaders examples testprogs fate
 
 include $(SRC_PATH)/tests/Makefile
@@ -194,4 +195,5 @@ $(sort $(OBJDIRS)):
 # so this saves some time on slow systems.
 .SUFFIXES:
 
-.PHONY: all all-yes alltools check *clean config install* testprogs uninstall*
+.PHONY: all all-yes alltools build check config testprogs
+.PHONY: *clean install* uninstall*

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 18:37:56 
2017 -0300| [5adc1f14f91b762d8e7a7056e98a1ede82a58b6c] | committer: James Almer

Merge commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5'

* commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5':
  build: Add "build" shorthand target that depends on all compile targets

Merged-by: James Almer 

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

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f964a770e6..22f194be9b 100644
--- a/Makefile
+++ b/Makefile
@@ -154,6 +154,7 @@ endif
 config:
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
 
+build: all alltools examples testprogs
 check: all alltools examples testprogs fate
 
 include $(SRC_PATH)/tests/Makefile
@@ -169,4 +170,5 @@ $(sort $(OBJDIRS)):
 # so this saves some time on slow systems.
 .SUFFIXES:
 
-.PHONY: all all-yes alltools check *clean config install* testprogs uninstall*
+.PHONY: all all-yes alltools build check config testprogs
+.PHONY: *clean install* uninstall*


==

diff --cc Makefile
index f964a770e6,dc4b0add9f..22f194be9b
--- a/Makefile
+++ b/Makefile
@@@ -142,19 -172,15 +142,20 @@@ clean:
  
  distclean::
$(RM) $(DISTCLEANSUFFIXES)
 -  $(RM) .version avversion.h config.asm config.h mapfile \
 -avbuild/.config avbuild/config.* libavutil/avconfig.h \
 -libavcodec/bsf_list.c libavformat/protocol_list.c
 +  $(RM) .version avversion.h config.asm config.h mapfile  \
 +  ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
 +  version.h libavutil/ffversion.h libavcodec/codec_names.h \
 +  libavcodec/bsf_list.c libavformat/protocol_list.c
 +ifeq ($(SRC_LINK),src)
 +  $(RM) src
 +endif
 +  $(RM) -rf doc/examples/pc-uninstalled
  
  config:
 -  $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
 +  $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
  
 -build: all alltools checkheaders examples testprogs
 -check: all alltools checkheaders examples testprogs fate
++build: all alltools examples testprogs
 +check: all alltools examples testprogs fate
  
  include $(SRC_PATH)/tests/Makefile
  

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] build: Allow generating dependencies as a side-effect of assembling

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Thu Oct 13 
02:45:09 2016 +0200| [3c0efbd03349ae68d3a25a08652a102e3fd4] | committer: 
Diego Biurrun

build: Allow generating dependencies as a side-effect of assembling

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

 Makefile  | 6 +++---
 configure | 8 
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d140ac392f..6ea8359318 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
 OBJCFLAGS  += $(EOBJCFLAGS)
 OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
 ASFLAGS:= $(CPPFLAGS) $(ASFLAGS)
-X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -I$( $(@:.o=.d)
-   $(X86ASM) $(X86ASMFLAGS) -I $(http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 18:40:29 
2017 -0300| [9908eac218661de44fb2da65860bd987c807af17] | committer: James Almer

Merge commit '3c0efbd03349ae68d3a25a08652a102e3fd4'

* commit '3c0efbd03349ae68d3a25a08652a102e3fd4':
  build: Allow generating dependencies as a side-effect of assembling
  build: Generalize yasm/nasm-related variable names

This commit is a noop, see
fd502f4f5fe8d2f241102ca9a529aa7f88209c22
0cc0c5b6dbf187f9c096de03d999da040197ffe6

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] build: Generalize yasm/nasm-related variable names

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Sat Oct  8 
16:18:33 2016 +0200| [39e208f4d4756367c7cd2d581847e0c1b8a429c1] | committer: 
Diego Biurrun

build: Generalize yasm/nasm-related variable names

None of them are specific to the YASM assembler.

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

 Makefile  | 12 +++
 avbuild/arch.mak  |  2 +-
 configure | 65 +++
 libavcodec/x86/Makefile   | 72 +++
 libavcodec/x86/dcadsp_init.c  |  8 ++---
 libavcodec/x86/fmtconvert_init.c  |  8 ++---
 libavcodec/x86/h264_qpel.c|  6 ++--
 libavcodec/x86/hpeldsp_init.c |  4 +--
 libavcodec/x86/mpegaudiodsp.c |  8 ++---
 libavcodec/x86/qpeldsp_init.c |  4 +--
 libavcodec/x86/rv40dsp_init.c |  8 ++---
 libavcodec/x86/vc1dsp_init.c  |  8 ++---
 libavcodec/x86/videodsp_init.c|  8 ++---
 libavcodec/x86/vp8dsp_init.c  | 12 +++
 libavcodec/x86/vp9dsp_init.c  |  8 ++---
 libavfilter/x86/Makefile  | 10 +++---
 libavfilter/x86/vf_gradfun_init.c |  8 ++---
 libavfilter/x86/vf_hqdn3d_init.c  |  4 +--
 libavresample/x86/Makefile|  6 ++--
 libavutil/x86/Makefile| 10 +++---
 libavutil/x86/cpu.c   |  4 +--
 libswscale/x86/Makefile   |  2 +-
 libswscale/x86/rgb2rgb_template.c |  4 +--
 tests/checkasm/Makefile   |  2 +-
 tests/checkasm/checkasm.h |  2 +-
 25 files changed, 145 insertions(+), 140 deletions(-)

diff --git a/Makefile b/Makefile
index dc4b0add9f..d140ac392f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ vpath %.texi $(SRC_PATH)
 ifndef V
 Q  = @
 ECHO   = printf "$(1)\t%s\n" $(2)
-BRIEF  = CC HOSTCC HOSTLD AS YASM AR LD
-SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP
+BRIEF  = CC HOSTCC HOSTLD AS X86ASM AR LD
+SILENT = DEPCC DEPHOSTCC DEPAS DEPX86ASM RANLIB RM STRIP
 MSG= $@
 M  = @$(call ECHO,$(TAG),$@);
 $(foreach VAR,$(BRIEF), \
@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
 OBJCFLAGS  += $(EOBJCFLAGS)
 OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
 ASFLAGS:= $(CPPFLAGS) $(ASFLAGS)
-YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
 HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 LDFLAGS:= $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 
@@ -57,8 +57,8 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)
 
 %.o: %.asm
-   $(DEPYASM) $(YASMFLAGS) -I $( $(@:.o=.d)
-   $(YASM) $(YASMFLAGS) -I $( $(@:.o=.d)
+   $(X86ASM) $(X86ASMFLAGS) -I $( $TMPS
 log_file $TMPS
 shift 1
-check_cmd $yasmexe $YASMFLAGS "$@" -o $TMPO $TMPS
+check_cmd $x86asmexe $X86ASMFLAGS "$@" -o $TMPO $TMPS
 }
 
 ld_o(){
@@ -1533,7 +1533,7 @@ BUILTIN_LIST="
 HAVE_LIST_CMDLINE="
 inline_asm
 symver
-yasm
+x86asm
 "
 
 HAVE_LIST_PUB="
@@ -1912,7 +1912,7 @@ fma3_deps="avx"
 fma4_deps="avx"
 avx2_deps="avx"
 
-mmx_external_deps="yasm"
+mmx_external_deps="x86asm"
 mmx_inline_deps="inline_asm"
 mmx_suggest="mmx_external mmx_inline"
 
@@ -2568,7 +2568,7 @@ pkg_config_default=pkg-config
 ranlib="ranlib"
 strip="strip"
 version_script='--version-script'
-yasmexe="yasm"
+x86asmexe="yasm"
 
 # machine
 arch_default=$(uname -m)
@@ -2817,6 +2817,11 @@ for opt do
 warn "avserver has been removed, the ${opt} option is only"\
  "provided for compatibility and will be removed in the future"
 ;;
+--enable-yasm|--disable-yasm)
+warn "The ${opt} option is only provided for compatibility and 
will be\n"\
+ "removed in the future. Use --enable-x86asm / 
--disable-x86asm instead."
+test $opt = --enable-yasm && x86asm=yes || x86asm=no
+;;
 --enable-?*|--disable-?*)
 eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
 if is_in $option $COMPONENT_LIST; then
@@ -4467,30 +4472,30 @@ EOF
 enabled ssse3  && check_inline_asm ssse3_inline  '"pabsw %xmm0, %xmm0"'
 enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
 
-if ! disabled_any asm mmx yasm; then
-if check_cmd $yasmexe --version; then
-enabled x86_64 && yasm_extra="-m amd64"
-yasm_debug="-g dwarf2"
+if ! disabled_any asm mmx x86asm; then
+if check_cmd $x86asmexe --version; then
+enabled x86_64 && x86asm_extra="-m amd64"
+x86asm_debug="-g dwarf2"
 elif check_cmd nasm -v; then
-yasmexe=nasm
-yasm_debug="-g -F dwarf"
+x86asmexe=nasm
+x86asm_debug="-g -F dwarf"
 enabled x86_64 && test "$objformat" = elf && objformat=elf64
 fi
 
-YASMFLAGS="-f $objformat $yasm_extra"
-enabled pic   && append YASMFLAGS "-DPIC"
-test -n "$extern_prefix"  && append YASMFLA

[FFmpeg-cvslog] fate: Add build-only targets to FATE

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Fri Oct  5 
14:46:38 2012 +0200| [db869f4ea4405fb8f9736e5ecdca70f77621a28e] | committer: 
Diego Biurrun

fate: Add build-only targets to FATE

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

 tests/Makefile   |  1 +
 tests/fate-run.sh|  4 
 tests/fate/build.mak | 17 +
 3 files changed, 22 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 30e06e8fdd..d3f11efaaa 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,7 @@ include $(SRC_PATH)/tests/fate/amrwb.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
+include $(SRC_PATH)/tests/fate/build.mak
 include $(SRC_PATH)/tests/fate/canopus.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/checkasm.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2403a6..8de749d4a7 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -192,6 +192,10 @@ pixfmts(){
 test=$outertest
 }
 
+null(){
+:
+}
+
 mkdir -p "$outdir"
 
 exec 3>&2
diff --git a/tests/fate/build.mak b/tests/fate/build.mak
new file mode 100644
index 00..ba9768e786
--- /dev/null
+++ b/tests/fate/build.mak
@@ -0,0 +1,17 @@
+FATE_BUILD += fate-build-alltools
+fate-build-alltools: alltools
+
+FATE_BUILD += fate-build-checkheaders
+fate-build-checkheaders: checkheaders
+
+FATE_BUILD += fate-build-examples
+fate-build-examples: examples
+
+FATE_BUILD += fate-build-testprogs
+fate-build-testprogs: testprogs
+
+$(FATE_BUILD): CMD = null
+$(FATE_BUILD): CMP = null
+
+FATE += $(FATE_BUILD)
+fate-build: $(FATE_BUILD)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 19:02:04 
2017 -0300| [85e2fe6281834ac7f16a12a332d9de4b2ec3cd29] | committer: James Almer

Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'

* commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e':
  fate: Add build-only targets to FATE

Merged-by: James Almer 

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

 tests/Makefile   |  1 +
 tests/fate-run.sh|  3 +++
 tests/fate/build.mak | 17 +
 3 files changed, 21 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 278be24ccb..656c2c59c5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -113,6 +113,7 @@ include $(SRC_PATH)/tests/fate/apng.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
+include $(SRC_PATH)/tests/fate/build.mak
 include $(SRC_PATH)/tests/fate/canopus.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/checkasm.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 4641640d42..51480b46c7 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -350,6 +350,9 @@ concat(){
 else
 run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of 
compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
 fi
+
+null(){
+:
 }
 
 mkdir -p "$outdir"
diff --git a/tests/fate/build.mak b/tests/fate/build.mak
new file mode 100644
index 00..f97f9ebe5c
--- /dev/null
+++ b/tests/fate/build.mak
@@ -0,0 +1,17 @@
+FATE_BUILD += fate-build-alltools
+fate-build-alltools: alltools
+
+FATE_BUILD += fate-build-checkheaders
+fate-build-checkheaders: checkheaders
+
+FATE_BUILD += fate-build-examples
+fate-build-examples: examples
+
+FATE_BUILD += fate-build-testprogs
+fate-build-testprogs: testprogs
+
+$(FATE_BUILD): CMD = null
+$(FATE_BUILD): CMP = null
+
+# FATE += $(FATE_BUILD)
+fate-build: $(FATE_BUILD)


==

diff --cc tests/fate-run.sh
index 4641640d42,8de749d4a7..51480b46c7
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@@ -284,72 -192,8 +284,75 @@@ pixfmts()
  test=$outertest
  }
  
 +gapless(){
 +sample=$(target_path $1)
 +extra_args=$2
 +
 +decfile1="${outdir}/${test}.out-1"
 +decfile2="${outdir}/${test}.out-2"
 +decfile3="${outdir}/${test}.out-3"
 +cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3"
 +
 +# test packet data
 +ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -c:a 
copy -f framecrc -y $decfile1
 +do_md5sum $decfile1
 +# test decoded (and cut) data
 +ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -f wav 
md5:
 +# the same as above again, with seeking to the start
 +ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact 
-fflags +bitexact -c:a copy -f framecrc -y $decfile2
 +do_md5sum $decfile2
 +ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact 
-fflags +bitexact -f wav md5:
 +# test packet data, with seeking to a specific position
 +ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact 
-fflags +bitexact -c:a copy -f framecrc -y $decfile3
 +do_md5sum $decfile3
 +}
 +
 +gaplessenc(){
 +sample=$(target_path $1)
 +format=$2
 +codec=$3
 +
 +file1="${outdir}/${test}.out-1"
 +cleanfiles="$cleanfiles $file1"
 +
 +# test data after reencoding
 +ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact -map 0:a -c:a 
$codec -f $format -y "$file1"
 +probegaplessinfo "$file1"
 +}
 +
 +audio_match(){
 +sample=$(target_path $1)
 +trefile=$(target_path $2)
 +extra_args=$3
 +
 +decfile="${outdir}/${test}.wav"
 +cleanfiles="$cleanfiles $decfile"
 +
 +ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact $extra_args -y 
$decfile
 +tests/audiomatch $decfile $trefile
 +}
 +
 +concat(){
 +template=$1
 +sample=$2
 +mode=$3
 +extra_args=$4
 +
 +concatfile="${outdir}/${test}.ffconcat"
 +packetfile="${outdir}/${test}.ffprobe"
 +cleanfiles="$concatfile $packetfile"
 +
 +awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
 +
 +if [ "$mode" = "md5" ]; then
 +run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 
-fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile
 +do_md5sum $packetfile
 +else
 +run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of 
compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
 +fi
++
+ null(){
+ :
  }
  
  mkdir -p "$outdir"
diff --cc tests/fate/build.mak
index 00,ba9768e786..f97f9ebe5c
mode 00,100644..100644
--- a/tests/fate/build.mak
+++ b/tests/fate/build.mak
@@@ -1,0 -1,17 +1,17 @@@
+ FATE_BUILD += fate-build-alltools
+ fate-build-alltools: alltools
+ 
+ FATE_BUILD += fate-build-checkh

[FFmpeg-cvslog] build: Add pthreads to list of avutil extralibs

2017-10-11 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Wed Mar  1 
12:02:11 2017 +0100| [5ff3b5cafcc685b6936d16602b0f80aa09a95870] | committer: 
Diego Biurrun

build: Add pthreads to list of avutil extralibs

libavutil uses pthreads in the buffer code (abstracted through a header).

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

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index cdeae9a7b3..7e788befc9 100755
--- a/configure
+++ b/configure
@@ -2524,7 +2524,7 @@ avdevice_extralibs="libm_extralibs"
 avformat_extralibs="libm_extralibs"
 avfilter_extralibs="pthreads_extralibs libm_extralibs"
 avresample_extralibs="libm_extralibs"
-avutil_extralibs="clock_gettime_extralibs cuda_extralibs libm_extralibs 
libmfx_extralibs nanosleep_extralibs user32_extralibs vaapi_extralibs 
vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs wincrypt_extralibs"
+avutil_extralibs="clock_gettime_extralibs cuda_extralibs libm_extralibs 
libmfx_extralibs nanosleep_extralibs pthreads_extralibs user32_extralibs 
vaapi_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs 
wincrypt_extralibs"
 swscale_extralibs="libm_extralibs"
 
 # programs

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 19:05:58 
2017 -0300| [7d2882bf52a66f52f1d978782b378427a32221bd] | committer: James Almer

Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'

* commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870':
  build: Add pthreads to list of avutil extralibs

This commit is a noop, see 6dfcbd80ad446ff163b47f2bf432bbf706436ea8

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fate: add missing closing bracket

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 19:35:56 
2017 -0300| [ef7766befde5f2f10c00517094d7153578a9aa94] | committer: James Almer

fate: add missing closing bracket

Regression since 85e2fe6281834ac7f16a12a332d9de4b2ec3cd29

Signed-off-by: James Almer 

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

 tests/fate-run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 51480b46c7..e8d2e67709 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -350,6 +350,7 @@ concat(){
 else
 run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of 
compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
 fi
+}
 
 null(){
 :

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] intmath: add faster clz support

2017-10-11 Thread Ganesh Ajjanagadde 
ffmpeg | branch: master | Ganesh Ajjanagadde  | Wed Feb 
22 12:53:33 2017 -0500| [7bfda7d157eb6f7a2df908addd60221a7a6f5eb0] | committer: 
Vittorio Giovara

intmath: add faster clz support

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

 libavutil/intmath.h | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index a5ee6525ee..780bbab039 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -44,6 +44,10 @@
 #   endif
 #endif /* ff_log2 */
 
+#ifndef ff_clz
+#   define ff_clz(v) __builtin_clz(v)
+#endif /* ff_clz */
+
 #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
 
 extern const uint8_t ff_log2_tab[256];
@@ -132,6 +136,21 @@ static av_always_inline av_const int ff_ctz_c(int v)
 }
 #endif
 
+#ifndef ff_clz
+#define ff_clz ff_clz_c
+static av_always_inline av_const unsigned ff_clz_c(unsigned x)
+{
+unsigned i = sizeof(x) * 8;
+
+while (x) {
+x >>= 1;
+i--;
+}
+
+return i;
+}
+#endif
+
 /**
  * Trailing zero bit count.
  *

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavutil: add av_mod_uintp2

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Feb 22 12:53:34 
2017 -0500| [19d57ca62e7134cb3cd5e937443501c417ceb79a] | committer: Vittorio 
Giovara

libavutil: add av_mod_uintp2

Signed-off-by: James Almer 

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

 libavutil/common.h | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/libavutil/common.h b/libavutil/common.h
index d2ddcba9ed..3832f107ba 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -183,6 +183,17 @@ static av_always_inline av_const unsigned 
av_clip_uintp2_c(int a, int p)
 }
 
 /**
+ * Clear high bits from an unsigned integer starting with specific bit position
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned 
p)
+{
+return a & ((1 << p) - 1);
+}
+
+/**
  * Add two signed 32-bit values with saturation.
  *
  * @param  a one value
@@ -410,6 +421,9 @@ static av_always_inline av_const int 
av_popcount64_c(uint64_t x)
 #ifndef av_clip_uintp2
 #   define av_clip_uintp2   av_clip_uintp2_c
 #endif
+#ifndef av_mod_uintp2
+#   define av_mod_uintp2av_mod_uintp2_c
+#endif
 #ifndef av_sat_add32
 #   define av_sat_add32 av_sat_add32_c
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Add Apple Pixlet decoder

2017-10-11 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Mon Sep 19 08:53:03 
2016 -0400| [aba5b94859ef1cb8f517dc64bce86a3021316ae8] | committer: Vittorio 
Giovara

Add Apple Pixlet decoder

Signed-off-by: Vittorio Giovara 

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

 Changelog   |   1 +
 doc/general.texi|   1 +
 libavcodec/Makefile |   1 +
 libavcodec/allcodecs.c  |   1 +
 libavcodec/avcodec.h|   1 +
 libavcodec/codec_desc.c |   7 +
 libavcodec/pixlet.c | 688 
 libavcodec/version.h|   2 +-
 libavformat/isom.c  |   2 +
 tests/fate/video.mak|   3 +
 tests/ref/fate/pixlet   |   2 +
 11 files changed, 708 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 713883d5f5..8e8bbcbf52 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version :
 - VAAPI-accelerated deinterlacing
 - config.log and other configuration files moved into avbuild/ directory
 - VAAPI-accelerated MPEG-2 and VP8 encoding
+- Apple Pixlet decoder
 
 
 version 12:
diff --git a/doc/general.texi b/doc/general.texi
index d232300028..54e319f1ad 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -590,6 +590,7 @@ following image formats are supported:
 @item ANSI/ASCII art @tab @tab  X
 @item Apple Intermediate Codec @tab @tab  X
 @item Apple MJPEG-B  @tab @tab  X
+@item Apple Pixlet   @tab @tab  X
 @item Apple ProRes   @tab  X  @tab  X
 @item Apple QuickDraw@tab @tab  X
 @tab fourcc: qdrw
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7d28d6685e..7f295dc643 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -375,6 +375,7 @@ OBJS-$(CONFIG_PGMYUV_DECODER)  += pnmdec.o pnm.o
 OBJS-$(CONFIG_PGMYUV_ENCODER)  += pnmenc.o
 OBJS-$(CONFIG_PGSSUB_DECODER)  += pgssubdec.o
 OBJS-$(CONFIG_PICTOR_DECODER)  += pictordec.o cga_data.o
+OBJS-$(CONFIG_PIXLET_DECODER)  += pixlet.o
 OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o
 OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
 OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 46c42c578a..1bfddb0ca6 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -231,6 +231,7 @@ void avcodec_register_all(void)
 REGISTER_ENCDEC (PGM,   pgm);
 REGISTER_ENCDEC (PGMYUV,pgmyuv);
 REGISTER_DECODER(PICTOR,pictor);
+REGISTER_DECODER(PIXLET,pixlet);
 REGISTER_ENCDEC (PNG,   png);
 REGISTER_ENCDEC (PPM,   ppm);
 REGISTER_ENCDEC (PRORES,prores);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b7bf85a041..489a618cbb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -392,6 +392,7 @@ enum AVCodecID {
 AV_CODEC_ID_MAGICYUV,
 AV_CODEC_ID_TRUEMOTION2RT,
 AV_CODEC_ID_AV1,
+AV_CODEC_ID_PIXLET,
 
 /* various PCM "codecs" */
 AV_CODEC_ID_FIRST_AUDIO = 0x1, ///< A dummy id pointing at the 
start of audio codecs
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 18568c9622..ab2018b41b 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1212,6 +1212,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
 .long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"),
 .props = AV_CODEC_PROP_LOSSY,
 },
+{
+.id= AV_CODEC_ID_PIXLET,
+.type  = AVMEDIA_TYPE_VIDEO,
+.name  = "pixlet",
+.long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"),
+.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+},
 
 /* image codecs */
 {
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
new file mode 100644
index 00..3b4ff42365
--- /dev/null
+++ b/libavcodec/pixlet.c
@@ -0,0 +1,688 @@
+/*
+ * Apple Pixlet decoder
+ * Copyright (c) 2016 Paul B Mahol
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include 
+
+#include "libavutil/imgutils.h"
+#include "libavutil/intmath.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#incl

[FFmpeg-cvslog] Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 19:44:56 
2017 -0300| [37caed777472256f0bb817adf1c5b8d9f59d85ae] | committer: James Almer

Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'

* commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8':
  Add Apple Pixlet decoder
  libavutil: add av_mod_uintp2
  intmath: add faster clz support

This commit is a noop, see
0dd8a3d71e2c01d42e868d6c6b8974fadfcc529e
d13e521cc861e791545dd6022fbf93f821e33618
73651090ca1183f37753ee30a7e206ca4fb9f4f0

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.

2017-10-11 Thread Sasi Inguva 
ffmpeg | branch: master | Sasi Inguva  | Tue 
Oct 10 10:36:58 2017 -0700| [2b006ccf8318d84101ed83b75df4c9682a963217] | 
committer: Michael Niedermayer

ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.

This is required for FLV files, for which duration_pts comes out to be zero.

Signed-off-by: Sasi Inguva 
Reviewed-by: Thomas Mundt 
Signed-off-by: Michael Niedermayer 

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

 fftools/ffmpeg.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 6d64bc1043..3ee31473dc 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2665,8 +2665,13 @@ static int process_input_packet(InputStream *ist, const 
AVPacket *pkt, int no_eo
 ist->next_dts = AV_NOPTS_VALUE;
 }
 
-if (got_output)
-ist->next_pts += av_rescale_q(duration_pts, 
ist->st->time_base, AV_TIME_BASE_Q);
+if (got_output) {
+if (duration_pts > 0) {
+ist->next_pts += av_rescale_q(duration_pts, 
ist->st->time_base, AV_TIME_BASE_Q);
+} else {
+ist->next_pts += duration_dts;
+}
+}
 break;
 case AVMEDIA_TYPE_SUBTITLE:
 if (repeating)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Fix visual glitch with XvMC, caused by wrong idct permutation.

2017-10-11 Thread Ivan Kalvachev 
ffmpeg | branch: master | Ivan Kalvachev  | Mon Oct  9 
01:25:00 2017 +0300| [9054439bad3307dafd9fbadc57e66c276baf22e2] | committer: 
Michael Niedermayer

Fix visual glitch with XvMC, caused by wrong idct permutation.

In the past XvMC forced simple_idct since
it was using FF_IDCT_PERM_NONE.
However now we have SIMD variants of simple_idct that
are using FF_IDCT_PERM_TRANSPOSE and if they are selected
XvMC would get coefficients in the wrong order.

The patch creates new FF_IDCT_NONE that
is used only for this kind of hardware decoding
and that fallbacks to the old C only simple idct.

Signed-off-by: Ivan Kalvachev 
Signed-off-by: Michael Niedermayer 

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

 libavcodec/avcodec.h   | 1 +
 libavcodec/idctdsp.c   | 1 +
 libavcodec/mpeg12dec.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 52cc5b0ca0..18c3e3ea1e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3146,6 +3146,7 @@ typedef struct AVCodecContext {
 #if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA   23
 #endif
+#define FF_IDCT_NONE  24 /* Used by XvMC to extract IDCT coefficients 
with FF_IDCT_PERM_NONE */
 #define FF_IDCT_SIMPLEAUTO128
 
 /**
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index d596aed1a9..0122d29efa 100644
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -279,6 +279,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, 
AVCodecContext *avctx)
 c->perm_type = FF_IDCT_PERM_NONE;
 #endif /* CONFIG_FAANIDCT */
 } else { // accurate/default
+/* Be sure FF_IDCT_NONE will select this one, since it uses 
FF_IDCT_PERM_NONE */
 c->idct_put  = ff_simple_idct_put_8;
 c->idct_add  = ff_simple_idct_add_8;
 c->idct  = ff_simple_idct_8;
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 22c29c1505..4e68be27f1 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1217,7 +1217,7 @@ static void setup_hwaccel_for_pixfmt(AVCodecContext 
*avctx)
 #endif
 )
 if (avctx->idct_algo == FF_IDCT_AUTO)
-avctx->idct_algo = FF_IDCT_SIMPLE;
+avctx->idct_algo = FF_IDCT_NONE;
 
 if (avctx->hwaccel && avctx->pix_fmt == AV_PIX_FMT_XVMC) {
 Mpeg1Context *s1 = avctx->priv_data;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: fix dependencies for v4l2_indev

2017-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed Oct 11 22:23:51 
2017 -0300| [734ed38931103c523c42333633a315a0ce1b5eb2] | committer: James Almer

configure: fix dependencies for v4l2_indev

There's no indev named libv4l2.

Fixes ticket #6729

Reviewed-by: bermond
Signed-off-by: James Almer 

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

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index dfbc251bb2..9f95d58c6e 100755
--- a/configure
+++ b/configure
@@ -3116,7 +3116,7 @@ kmsgrab_indev_deps="libdrm"
 lavfi_indev_deps="avfilter"
 libcdio_indev_deps="libcdio"
 libdc1394_indev_deps="libdc1394"
-libv4l2_indev_deps="libv4l2"
+v4l2_indev_deps="libv4l2"
 openal_indev_deps="openal"
 opengl_outdev_deps="opengl"
 oss_indev_deps_any="soundcard_h sys_soundcard_h"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog