Attachment #51283 for bug #82127

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

Lines 49-55 Link Here

(-)vice-1.16/src/arch/unix/ffmpeglib.c (-1 / +1 lines)
49	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);	49	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);
50	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);	50	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);
51	GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);	51	GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);
52	GET_PROC_ADDRESS_AND_TEST_AVCODEC(__av_freep);	52	GET_PROC_ADDRESS_AND_TEST_AVCODEC(av_freep);
53		53
54	GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_register_all);	54	GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_register_all);
55	GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_new_stream);	55	GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_new_stream);

Lines 54-60 Link Here

(-)vice-1.16/src/arch/win32/ffmpeglib.c (-2 / +2 lines)
54	lib->p_avpicture_fill = NULL;	54	lib->p_avpicture_fill = NULL;
55	lib->p_avpicture_get_size = NULL;	55	lib->p_avpicture_get_size = NULL;
56	lib->p_img_convert = NULL;	56	lib->p_img_convert = NULL;
57	lib->p___av_freep = NULL;	57	lib->p_av_freep = NULL;
58		58
59	if (avformat_dll) {	59	if (avformat_dll) {
60	if (!FreeLibrary(avformat_dll)) {	60	if (!FreeLibrary(avformat_dll)) {
Lines 113-119 Link Here
113	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);	113	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);
114	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);	114	GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);
115	GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);	115	GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);
116	GET_PROC_ADDRESS_AND_TEST_AVCODEC(__av_freep);	116	GET_PROC_ADDRESS_AND_TEST_AVCODEC(av_freep);
117	}	117	}
118		118
119	if (!avformat_dll) {	119	if (!avformat_dll) {

Lines 1672-1679 Link Here

(-)vice-1.16/src/gfxoutputdrv/ffmpeg/avcodec.h (-2 / +1 lines)
1672	void av_realloc(void ptr, unsigned int size);	1672	void av_realloc(void ptr, unsigned int size);
1673	void av_free(void *ptr);	1673	void av_free(void *ptr);
1674	char av_strdup(const char s);	1674	char av_strdup(const char s);
1675	void __av_freep(void **ptr);	1675	void av_freep(void **ptr);
1676	#define av_freep(p) __av_freep((void **)(p))
1677	void av_fast_realloc(void ptr, unsigned int *size, unsigned int min_size);	1676	void av_fast_realloc(void ptr, unsigned int *size, unsigned int min_size);
1678	/* for static data only */	1677	/* for static data only */
1679	/* call av_free_static to release all staticaly allocated tables */	1678	/* call av_free_static to release all staticaly allocated tables */

Lines 553-559 Link Here

(-)vice-1.16/src/gfxoutputdrv/ffmpegdrv.c (-1 / +1 lines)
553		553
554	/* free the streams */	554	/* free the streams */
555	for(i = 0; i < ffmpegdrv_oc->nb_streams; i++) {	555	for(i = 0; i < ffmpegdrv_oc->nb_streams; i++) {
556	(ffmpeglib.p___av_freep)((void*)&ffmpegdrv_oc->streams[i]);	556	(ffmpeglib.p_av_freep)((void*)&ffmpegdrv_oc->streams[i]);
557	}	557	}
558		558
559		559

Lines 48-54 Link Here

(-)vice-1.16/src/gfxoutputdrv/ffmpeglib.h (-2 / +2 lines)
48	typedef int (avpicture_fill_t) (AVPicture, uint8_t*, int, int, int);	48	typedef int (avpicture_fill_t) (AVPicture, uint8_t*, int, int, int);
49	typedef int (*avpicture_get_size_t) (int, int, int);	49	typedef int (*avpicture_get_size_t) (int, int, int);
50	typedef int (img_convert_t) (AVPicture, int, AVPicture*, int, int, int);	50	typedef int (img_convert_t) (AVPicture, int, AVPicture*, int, int, int);
51	typedef void (__av_freep_t) (void*);	51	typedef void (av_freep_t) (void*);
52		52
53	/* avformat fucntions */	53	/* avformat fucntions */
54	typedef void (*av_register_all_t) (void);	54	typedef void (*av_register_all_t) (void);
Lines 71-77 Link Here
71	avpicture_fill_t p_avpicture_fill;	71	avpicture_fill_t p_avpicture_fill;
72	avpicture_get_size_t p_avpicture_get_size;	72	avpicture_get_size_t p_avpicture_get_size;
73	img_convert_t p_img_convert;	73	img_convert_t p_img_convert;
74	__av_freep_t p___av_freep;	74	av_freep_t p_av_freep;
75		75
76	av_register_all_t p_av_register_all;	76	av_register_all_t p_av_register_all;
77	av_new_stream_t p_av_new_stream;	77	av_new_stream_t p_av_new_stream;

Return to bug 82127