diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
| commit | 619b8d955269f2fe74386e98fac07675c8b55352 (patch) | |
| tree | f3e2610a39c99a7e43bc2b345280b04e398b986a /pcr/mediastreamer/mediastreamer-ffmpeg.patch | |
| parent | 2b04539ac9310541a4e563460aed0cb7715770d2 (diff) | |
| parent | 7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 (diff) | |
| download | abslibre-619b8d955269f2fe74386e98fac07675c8b55352.tar.gz abslibre-619b8d955269f2fe74386e98fac07675c8b55352.tar.bz2 abslibre-619b8d955269f2fe74386e98fac07675c8b55352.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/mediastreamer/mediastreamer-ffmpeg.patch')
| -rw-r--r-- | pcr/mediastreamer/mediastreamer-ffmpeg.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/pcr/mediastreamer/mediastreamer-ffmpeg.patch b/pcr/mediastreamer/mediastreamer-ffmpeg.patch new file mode 100644 index 000000000..3304e9f56 --- /dev/null +++ b/pcr/mediastreamer/mediastreamer-ffmpeg.patch @@ -0,0 +1,57 @@ +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; + */ |