[transcode]: fix libx264 profile setting

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index d060656c2c18bad1702fcaef92351b3d3cbd1009..5d481683f329bbb82d6e155a2d087108259a7663 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -183,6 +183,7 @@ ifeq (yes,$(CONFIG_LIBX264))
 
 EXTLIBS  += libx264
 ENCODERS += libx264
+FFMPEG_DIFFS += ffmpeg.libx264.diff
 
 endif
 
@@ -603,6 +604,7 @@ $(LIB_ROOT)/$(FFMPEG)/.tvh_download:
        @mkdir -p $(EBUILDIR)
        $(call DOWNLOAD,$(FFMPEG_URL),$(LIB_ROOT)/$(FFMPEG_TB),$(FFMPEG_SHA1))
        $(call UNTAR,$(FFMPEG_TB),j)
+       $(call PATCH,$(FFMPEG),$(FFMPEG_DIFFS))
        @touch $@
 
 $(LIB_ROOT)/$(FFMPEG)/.tvh_build: \

diff --git a/support/patches/ffmpeg.libx264.diff b/support/patches/ffmpeg.libx264.diff
new file mode 100644 (file)
index 0000000..5e28ee4
--- /dev/null
+++ b/support/patches/ffmpeg.libx264.diff
@@ -0,0 +1,12 @@
+diff -urN ../ffmpeg-3.1.2.orig/libavcodec/libx264.c ./libavcodec/libx264.c
+--- ../ffmpeg-3.1.2.orig/libavcodec/libx264.c  2016-08-09 00:53:26.000000000 +0200
++++ ./libavcodec/libx264.c     2016-08-22 07:46:36.641867975 +0200
+@@ -902,7 +902,7 @@
+ static const AVOption options[] = {
+     { "preset",        "Set the encoding preset (cf. x264 --fullhelp)",   OFFSET(preset),        AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE},
+     { "tune",          "Tune the encoding params (cf. x264 --fullhelp)",  OFFSET(tune),          AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
+-    { "profile",       "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile),       AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
++    { "x264profile",   "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile),       AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
+     { "fastfirstpass", "Use fast settings when encoding first pass",      OFFSET(fastfirstpass), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},
+     {"level", "Specify level (as defined by Annex A)", OFFSET(level), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE},
+     {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE},