diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-07 00:54:45 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-07 00:54:45 -0700 |
| commit | 5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 (patch) | |
| tree | 67c71a4fc1f20a59b619c908f6a53c2cde2b46c9 /extra/mediastreamer/mediastreamer-ffmpeg.patch | |
| parent | afcab02cc1bc97b4090668931e372fd47cedf04d (diff) | |
Sun Apr 7 00:54:38 PDT 2013
Diffstat (limited to 'extra/mediastreamer/mediastreamer-ffmpeg.patch')
| -rw-r--r-- | extra/mediastreamer/mediastreamer-ffmpeg.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 3304e9f56..000000000 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f586917ea4d66f9ba8910f0967a8830e54d50784 -Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> -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; - */ |