From 40a0a498a7cbf25a186b26fe93a90ba33a215e65 Mon Sep 17 00:00:00 2001 From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Date: Mon, 15 Feb 2016 13:04:39 -0500 Subject: [PATCH] contrib: bump ffmepg - Lots of bugfixes and CVE fix Tuleap: #381 Change-Id: I32ac56cea5b6a5a8b3154ee262599870fbdd33ed --- contrib/src/ffmpeg/rules.mak | 5 +---- src/media/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index d5b61f8074..ff0d24c4ac 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -1,4 +1,4 @@ -FFMPEG_HASH := f90c9bbbca32620a9cb78898a2b1b7d2cce9ad0f +FFMPEG_HASH := c40983a6f631d22fede713d535bb9c31d5c9740c FFMPEG_GITURL := https://github.com/FFmpeg/FFmpeg.git ifdef HAVE_WIN32 @@ -123,9 +123,6 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg mkdir -p $@-$(FFMPEG_HASH) (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1 -f ../$<) $(UPDATE_AUTOCONFIG) - $(APPLY) $(SRC)/ffmpeg/0001-rtpdec-add-a-trace-when-jitter-buffer-is-full.patch - $(APPLY) $(SRC)/ffmpeg/0002-rtpdec-inform-jitter-buffer-size.patch - $(APPLY) $(SRC)/ffmpeg/0003-rtsp-warning-when-max_delay-reached.patch $(MOVE) .ffmpeg: ffmpeg diff --git a/src/media/Makefile.am b/src/media/Makefile.am index c30f17df78..bee4635ad2 100644 --- a/src/media/Makefile.am +++ b/src/media/Makefile.am @@ -46,7 +46,7 @@ endif libmedia_la_LDFLAGS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ if HAVE_WIN32 -libmedia_la_LDFLAGS += -lws2_32 -lwsock32 +libmedia_la_LDFLAGS += -lws2_32 -lwsock32 -lshlwapi endif AM_CFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ -- GitLab