Mercurial > libavcodec.hg
changeset 3582:6310389a9688 libavcodec
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
| author | gpoirier |
|---|---|
| date | Tue, 15 Aug 2006 14:59:27 +0000 |
| parents | 49082584828a |
| children | 562758eaf7bf |
| files | mpegvideo.h snow.h |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo.h Mon Aug 14 22:55:11 2006 +0000 +++ b/mpegvideo.h Tue Aug 15 14:59:27 2006 +0000 @@ -909,7 +909,11 @@ 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);
--- a/snow.h Mon Aug 14 22:55:11 2006 +0000 +++ b/snow.h Tue Aug 15 14:59:27 2006 +0000 @@ -125,9 +125,13 @@ extern void ff_snow_horizontal_compose97i(DWTELEM *b, int width); 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); +#ifdef CONFIG_SNOW_ENCODER int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); int w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); - +#else +static int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {assert (0);} +static int w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {assert (0);} +#endif /* C bits used by mmx/sse2/altivec */