From 932a361aadd4fc2d6e29379f03e9c12c5e2ea103 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 8 Nov 2012 16:42:47 +0100 Subject: [PATCH] - fix building with ffmpeg 1.0 --- mediastreamer-ffmpeg10.patch | 57 ++++++++++++++++++++++++++++++++++++ mediastreamer.spec | 2 ++ 2 files changed, 59 insertions(+) create mode 100644 mediastreamer-ffmpeg10.patch diff --git a/mediastreamer-ffmpeg10.patch b/mediastreamer-ffmpeg10.patch new file mode 100644 index 0000000..3304e9f --- /dev/null +++ b/mediastreamer-ffmpeg10.patch @@ -0,0 +1,57 @@ +commit f586917ea4d66f9ba8910f0967a8830e54d50784 +Author: Yann Diorcet +Date: Tue Jun 5 11:07:48 2012 +0200 + + Fixes for new versions of ffmpeg + +diff --git a/src/h264dec.c b/src/h264dec.c +index c4a84ee..5229b5e 100644 +--- a/src/h264dec.c ++++ b/src/h264dec.c +@@ -45,7 +45,9 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + done=TRUE; + } +diff --git a/src/videoenc.c b/src/videoenc.c +index 21d016f..fb35760 100644 +--- a/src/videoenc.c ++++ b/src/videoenc.c +@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + static bool_t avcodec_initialized=FALSE; + ++#ifndef FF_I_TYPE ++#define FF_I_TYPE AV_PICTURE_TYPE_I ++#endif ++ + #ifdef ENABLE_LOG_FFMPEG + + void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) + + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ ++ /* + c->flags|=CODEC_FLAG_H263P_UMV; + c->flags|=CODEC_FLAG_AC_PRED; + c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; +- /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; + */ diff --git a/mediastreamer.spec b/mediastreamer.spec index 6c1f85a..0a69870 100644 --- a/mediastreamer.spec +++ b/mediastreamer.spec @@ -7,6 +7,7 @@ Group: Libraries Source0: http://mirror.lihnidos.org/GNU/savannah/linphone/mediastreamer/%{name}-%{version}.tar.gz # Source0-md5: e51ea9d5fce1396b374d10473dfbadec Patch0: %{name}-nov4l1.atch +Patch1: %{name}-ffmpeg10.atch URL: http://www.linphone.org/eng/documentation/dev/mediastreamer2.html BuildRequires: SDL-devel BuildRequires: alsa-lib-devel @@ -52,6 +53,7 @@ Static mediastreamer library. %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__sed} -i 's,gsm/gsm.h,gsm.h,g' configure.ac src/gsm.c %build -- 2.44.0