Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Makefile.ffmpeg: update to ffmpeg-2.8.2, libvpx 1.5, x264-snapshot-20…
…151120-2245, x265_1.8, fixes #3334
  • Loading branch information
perexg committed Nov 21, 2015
1 parent f6c54ce commit 0a7365a
Showing 1 changed file with 31 additions and 8 deletions.
39 changes: 31 additions & 8 deletions Makefile.ffmpeg
Expand Up @@ -56,10 +56,10 @@ EXTRAENV =
CONFIGURE = TVHEADEND_LIBAV_BUILD=$(LIBAVDIR)/build/ffmpeg \
PKG_CONFIG=$(ROOTDIR)/support/pkg-config.ffmpeg ./configure

FFMPEG = ffmpeg-2.8.1
FFMPEG = ffmpeg-2.8.2
FFMPEG_TB = $(FFMPEG).tar.bz2
FFMPEG_URL = http://ffmpeg.org/releases/$(FFMPEG_TB)
FFMPEG_SHA1 = 95046cd9251b69c61b11ebcd1e163ac14d0fc2c6
FFMPEG_SHA1 = 1952aeb9ec3f569514d8db4f30c195b765392639

EXTLIBS = libx264 libvorbis libvpx
COMPONENTS = avutil avformat avcodec swresample swscale avfilter avresample
Expand All @@ -80,20 +80,20 @@ LIBVORBIS_TB = $(LIBVORBIS).tar.gz
LIBVORBIS_URL = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS_TB)
LIBVORBIS_SHA1 = 10c7fee173178d72855aa7593dfe49d9b3d6c804

LIBX264 = x264-snapshot-20150917-2245
LIBX264 = x264-snapshot-20151120-2245
LIBX264_TB = $(LIBX264).tar.bz2
LIBX264_URL = http://ftp.via.ecp.fr/pub/videolan/x264/snapshots/$(LIBX264_TB)
LIBX264_SHA1 = c3aaa03edc595b0db038efd081364aacee0fd7fa
LIBX264_SHA1 = 6ca54b8e257ef52f55c752e94e77dbc93fe32fe4

LIBX265 = x265_1.7
LIBX265 = x265_1.8
LIBX265_TB = $(LIBX265).tar.gz
LIBX265_URL = http://ftp.videolan.org/pub/videolan/x265/$(LIBX265_TB)
LIBX265_SHA1 = ee078ffe6858d17a25a268b69a1c651ef3b63945
LIBX265_SHA1 = 10092d220cd361868672641b8ce7b575cb42bb82

LIBVPX = libvpx-1.4.0
LIBVPX = libvpx-1.5.0
LIBVPX_TB = $(LIBVPX).tar.bz2
LIBVPX_URL = http://storage.googleapis.com/downloads.webmproject.org/releases/webm/$(LIBVPX_TB)
LIBVPX_SHA1 = d05f4e9a9878886282ac9c9246f8fac080c94c8f
LIBVPX_SHA1 = 0baf76627eb08450eaf307347d1721f56a880c64

YASM = yasm-1.3.0
YASM_TB = $(YASM).tar.gz
Expand Down Expand Up @@ -346,6 +346,29 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_download:
@mkdir -p $(LIBAVDIR)/build
$(call DOWNLOAD,$(FFMPEG_URL),$(LIBAVDIR)/$(FFMPEG_TB),$(FFMPEG_SHA1))
$(call UNTAR,$(FFMPEG_TB),j)
@cd $(LIBAVDIR)/$(FFMPEG) && echo -en "\
--- libavcodec/libvpxenc.c.old 2015-11-21 21:52:16.502341511 +0100\n\
+++ libavcodec/libvpxenc.c 2015-11-21 21:53:18.164552128 +0100\n\
@@ -104,19 +104,11 @@\n\
\n\
/** String mappings for enum vp8e_enc_control_id */\n\
static const char *const ctlidstr[] = {\n\
- [VP8E_UPD_ENTROPY] = \"VP8E_UPD_ENTROPY\",\n\
- [VP8E_UPD_REFERENCE] = \"VP8E_UPD_REFERENCE\",\n\
- [VP8E_USE_REFERENCE] = \"VP8E_USE_REFERENCE\",\n\
- [VP8E_SET_ROI_MAP] = \"VP8E_SET_ROI_MAP\",\n\
- [VP8E_SET_ACTIVEMAP] = \"VP8E_SET_ACTIVEMAP\",\n\
- [VP8E_SET_SCALEMODE] = \"VP8E_SET_SCALEMODE\",\n\
[VP8E_SET_CPUUSED] = \"VP8E_SET_CPUUSED\",\n\
[VP8E_SET_ENABLEAUTOALTREF] = \"VP8E_SET_ENABLEAUTOALTREF\",\n\
[VP8E_SET_NOISE_SENSITIVITY] = \"VP8E_SET_NOISE_SENSITIVITY\",\n\
- [VP8E_SET_SHARPNESS] = \"VP8E_SET_SHARPNESS\",\n\
[VP8E_SET_STATIC_THRESHOLD] = \"VP8E_SET_STATIC_THRESHOLD\",\n\
[VP8E_SET_TOKEN_PARTITIONS] = \"VP8E_SET_TOKEN_PARTITIONS\",\n\
- [VP8E_GET_LAST_QUANTIZER] = \"VP8E_GET_LAST_QUANTIZER\",\n\
[VP8E_SET_ARNR_MAXFRAMES] = \"VP8E_SET_ARNR_MAXFRAMES\",\n\
[VP8E_SET_ARNR_STRENGTH] = \"VP8E_SET_ARNR_STRENGTH\",\n\
[VP8E_SET_ARNR_TYPE] = \"VP8E_SET_ARNR_TYPE\",\n" | patch -p0
@touch $@

$(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
Expand Down

0 comments on commit 0a7365a

Please sign in to comment.