Compile fix (for GCC<3.3) when encoders are disabled Original thread: Date: Aug 10, 2006 10:45 AM Subject: [Ffmpeg-devel] [PATCH] fix compilation when Snow ENcoder is disabled

Originally committed as revision 6000 to svn://svn.ffmpeg.org/ffmpeg/trunk

Guillaume Poirier committed 20 years ago

Commit 696e1bb1 parent 91d0bda2 files · +9 −1Browse files

Unified · Split

2 files

                    int dir);
 void ff_set_mpeg4_time(MpegEncContext * s, int picture_number);
 void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
+#ifdef CONFIG_ENCODERS
 void h263_encode_init(MpegEncContext *s);
+#else
+static void h263_encode_init(MpegEncContext *s) {assert(0);}
+#endif
 void h263_decode_init_vlc(MpegEncContext *s);
 int h263_decode_picture_header(MpegEncContext *s);
 int ff_h263_decode_gob_header(MpegEncContext *s);

@@ -125,9 +125,13 @@ extern void ff_snow_vertical_compose97i(DWTELEM b0, DWTELEM b1, DWTELEM *b2, D · 124 unmodified lines
125	extern void ff_snow_horizontal_compose97i(DWTELEM *b, int width);	125	extern void ff_snow_horizontal_compose97i(DWTELEM *b, int width);
126	extern void ff_snow_inner_add_yblock(uint8_t obmc, const int obmc_stride, uint8_t * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8);	126	extern void ff_snow_inner_add_yblock(uint8_t obmc, const int obmc_stride, uint8_t * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8);
127		127
		128	#ifdef CONFIG_SNOW_ENCODER
128	int w53_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h);	129	int w53_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h);
129	int w97_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h);	130	int w97_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h);
130		131	#else
		132	static int w53_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h) {assert (0);}
		133	static int w97_32_c(void v, uint8_t pix1, uint8_t * pix2, int line_size, int h) {assert (0);}
		134	#endif
131		135
132	/* C bits used by mmx/sse2/altivec */	136	/* C bits used by mmx/sse2/altivec */
133		137

Keyboard shortcuts