Attachment #331628 for bug #445168

View | Details | Raw Unified | Return to bug 445168
Collapse All | Expand All

Lines 45-51 typedef struct _DecData{ Link Here

(-)a/src/h264dec.c (+2 lines)
45	static void ffmpeg_init(){	45	static void ffmpeg_init(){
46	static bool_t done=FALSE;	46	static bool_t done=FALSE;
47	if (!done){	47	if (!done){
		48	#ifdef FF_API_AVCODEC_INIT
48	avcodec_init();	49	avcodec_init();
		50	#endif
49	avcodec_register_all();	51	avcodec_register_all();
50	done=TRUE;	52	done=TRUE;
51	}	53	}

Lines 39-44 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Link Here

(-)a/src/videoenc.c (-1 / +7 lines)
39		39
40	static bool_t avcodec_initialized=FALSE;	40	static bool_t avcodec_initialized=FALSE;
41		41
		42	#ifndef FF_I_TYPE
		43	#define FF_I_TYPE AV_PICTURE_TYPE_I
		44	#endif
		45
42	#ifdef ENABLE_LOG_FFMPEG	46	#ifdef ENABLE_LOG_FFMPEG
43		47
44	void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)	48	void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
Lines 53-59 void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) Link Here
53		57
54	void ms_ffmpeg_check_init(){	58	void ms_ffmpeg_check_init(){
55	if(!avcodec_initialized){	59	if(!avcodec_initialized){
		60	#ifdef FF_API_AVCODEC_INIT
56	avcodec_init();	61	avcodec_init();
		62	#endif
57	avcodec_register_all();	63	avcodec_register_all();
58	avcodec_initialized=TRUE;	64	avcodec_initialized=TRUE;
59	#ifdef ENABLE_LOG_FFMPEG	65	#ifdef ENABLE_LOG_FFMPEG
Lines 300-309 static void prepare_h263(EncState *s){ Link Here
300	if (s->profile==0){	306	if (s->profile==0){
301	s->codec=CODEC_ID_H263;	307	s->codec=CODEC_ID_H263;
302	}else{	308	}else{
		309	/*
303	c->flags\|=CODEC_FLAG_H263P_UMV;	310	c->flags\|=CODEC_FLAG_H263P_UMV;
304	c->flags\|=CODEC_FLAG_AC_PRED;	311	c->flags\|=CODEC_FLAG_AC_PRED;
305	c->flags\|=CODEC_FLAG_H263P_SLICE_STRUCT;	312	c->flags\|=CODEC_FLAG_H263P_SLICE_STRUCT;
306	/*
307	c->flags\|=CODEC_FLAG_OBMC;	313	c->flags\|=CODEC_FLAG_OBMC;
308	c->flags\|=CODEC_FLAG_AC_PRED;	314	c->flags\|=CODEC_FLAG_AC_PRED;
309	*/	315	*/

Return to bug 445168