buildroot
Public
Source
committed 71813756696- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);Add support for ffmpeg 3.0Changes from original commit are only in file paths & quilt refresh.commit c31b7d374062f87c7512d9872cbceac920465913Author: Philip Langdale <philipl@overt.org>Date: Mon Sep 21 19:49:36 2015 -0700 ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master The deprecated PixelFormat and PIX_FMT_* names have been removed in ffmpeg master.Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>[Downloaded fromhttps://gitweb.gentoo.org/repo/gentoo.git/tree/media-tv/kodi/files/kodi-16-ffmpeg3.patch]Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h===================================================================--- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h@@ -24,7 +24,6 @@ #include "utils/CPUInfo.h" extern "C" {-#include "libswscale/swscale.h" #include "libavcodec/avcodec.h" #include "libavformat/avformat.h" #include "libavutil/avutil.h"@@ -33,23 +32,6 @@ extern "C" { #include "libpostproc/postprocess.h" }-inline int SwScaleCPUFlags()-{- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();- int flags = 0;-- if (cpuFeatures & CPU_FEATURE_MMX)- flags |= SWS_CPU_CAPS_MMX;- if (cpuFeatures & CPU_FEATURE_MMX2)- flags |= SWS_CPU_CAPS_MMX2;- if (cpuFeatures & CPU_FEATURE_3DNOW)- flags |= SWS_CPU_CAPS_3DNOW;- if (cpuFeatures & CPU_FEATURE_ALTIVEC)- flags |= SWS_CPU_CAPS_ALTIVEC;-- return flags;-}- inline int PPCPUFlags() { unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp===================================================================--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp@@ -39,7 +39,7 @@ extern "C" { #include "libswscale/swscale.h" }-// allocate a new picture (PIX_FMT_YUV420P)+// allocate a new picture (AV_PIX_FMT_YUV420P)