Merge branch 'ffmpeg-gl-transition-ffmpeg/4.1' into ffmpeg-gl-transit…

…ion-ffmpeg/4.2
livingbio · Aug 28, 2019 · f75dc29 · f75dc29
2 parents 75384bc + 4e65fd6
commit f75dc29
Show file tree

Hide file tree

Showing 6 changed files with 568 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,12 @@
 language: c
 sudo: false
-os:
-  - linux
-  - osx
 addons:
   apt:
     packages:
       - nasm
       - diffutils
 compiler:
-  - clang
   - gcc
-matrix:
-    exclude:
-        - os: osx
-          compiler: gcc
 cache:
   directories:
     - ffmpeg-samples
@@ -24,7 +16,7 @@ install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
 script:
   - mkdir -p ffmpeg-samples
-  - ./configure --samples=ffmpeg-samples --cc=$CC
+  - ./configure --samples=ffmpeg-samples --cc=$CC --enable-gpl --enable-opengl --extra-libs='-lGLEW -lglfw' --enable-filter=gltransition --disable-shared --enable-static
   - make -j 8
   - make fate-rsync
   - make check -j 8
diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c
@@ -745,7 +745,7 @@ static void construct_vector (
     for (j = 0; j < veclen; j++) {
         a32 = SPL_MUL_16_16(*gainPtr++, cbvec0[j]);
         a32 += SPL_MUL_16_16(*gainPtr++, cbvec1[j]);
-        a32 += SPL_MUL_16_16(*gainPtr, cbvec2[j]);
+        a32 += (unsigned)SPL_MUL_16_16(*gainPtr, cbvec2[j]);
         gainPtr -= 2;
         decvector[j] = (int)(a32 + 8192) >> 14;
     }

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
@@ -433,6 +433,7 @@ OBJS-$(CONFIG_YADIF_CUDA_FILTER)             += vf_yadif_cuda.o vf_yadif_cuda.pt
 OBJS-$(CONFIG_ZMQ_FILTER)                    += f_zmq.o
 OBJS-$(CONFIG_ZOOMPAN_FILTER)                += vf_zoompan.o
 OBJS-$(CONFIG_ZSCALE_FILTER)                 += vf_zscale.o
+OBJS-$(CONFIG_GLTRANSITION_FILTER)           += vf_gltransition.o
 
 OBJS-$(CONFIG_ALLRGB_FILTER)                 += vsrc_testsrc.o
 OBJS-$(CONFIG_ALLYUV_FILTER)                 += vsrc_testsrc.o

diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
@@ -411,6 +411,7 @@ extern AVFilter ff_vf_yadif_cuda;
 extern AVFilter ff_vf_zmq;
 extern AVFilter ff_vf_zoompan;
 extern AVFilter ff_vf_zscale;
+extern AVFilter ff_vf_gltransition;
 
 extern AVFilter ff_vsrc_allrgb;
 extern AVFilter ff_vsrc_allyuv;