]>
Commit | Line | Data |
---|---|---|
932a361a JR |
1 | commit f586917ea4d66f9ba8910f0967a8830e54d50784 |
2 | Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> | |
3 | Date: Tue Jun 5 11:07:48 2012 +0200 | |
4 | ||
5 | Fixes for new versions of ffmpeg | |
6 | ||
7 | diff --git a/src/h264dec.c b/src/h264dec.c | |
8 | index c4a84ee..5229b5e 100644 | |
9 | --- a/src/h264dec.c | |
10 | +++ b/src/h264dec.c | |
11 | @@ -45,7 +45,9 @@ typedef struct _DecData{ | |
12 | static void ffmpeg_init(){ | |
13 | static bool_t done=FALSE; | |
14 | if (!done){ | |
15 | +#ifdef FF_API_AVCODEC_INIT | |
16 | avcodec_init(); | |
17 | +#endif | |
18 | avcodec_register_all(); | |
19 | done=TRUE; | |
20 | } | |
21 | diff --git a/src/videoenc.c b/src/videoenc.c | |
22 | index 21d016f..fb35760 100644 | |
23 | --- a/src/videoenc.c | |
24 | +++ b/src/videoenc.c | |
25 | @@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
26 | ||
27 | static bool_t avcodec_initialized=FALSE; | |
28 | ||
29 | +#ifndef FF_I_TYPE | |
30 | +#define FF_I_TYPE AV_PICTURE_TYPE_I | |
31 | +#endif | |
32 | + | |
33 | #ifdef ENABLE_LOG_FFMPEG | |
34 | ||
35 | void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) | |
36 | @@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) | |
37 | ||
38 | void ms_ffmpeg_check_init(){ | |
39 | if(!avcodec_initialized){ | |
40 | +#ifdef FF_API_AVCODEC_INIT | |
41 | avcodec_init(); | |
42 | +#endif | |
43 | avcodec_register_all(); | |
44 | avcodec_initialized=TRUE; | |
45 | #ifdef ENABLE_LOG_FFMPEG | |
46 | @@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ | |
47 | if (s->profile==0){ | |
48 | s->codec=CODEC_ID_H263; | |
49 | }else{ | |
50 | + /* | |
51 | c->flags|=CODEC_FLAG_H263P_UMV; | |
52 | c->flags|=CODEC_FLAG_AC_PRED; | |
53 | c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; | |
54 | - /* | |
55 | c->flags|=CODEC_FLAG_OBMC; | |
56 | c->flags|=CODEC_FLAG_AC_PRED; | |
57 | */ |