diff options
| author | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-08-15 14:59:27 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-08-15 14:59:27 +0000 |
| commit | 696e1bb36e46e304d92a92cfd2a782499b5ff3f1 (patch) | |
| tree | f9a0927aaba2a56acc9d5309e3fb16b75b56edeb /libavcodec | |
| parent | 91d0bda26db45dc23ac9acbb1df0c851817692d3 (diff) | |
| download | ffmpeg-696e1bb36e46e304d92a92cfd2a782499b5ff3f1.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 | ||||
| -rw-r--r-- | libavcodec/snow.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 023e657004..d8eebc3bbf 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -909,7 +909,11 @@ void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, 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); diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 26b30abe57..8dfabf563e 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -125,9 +125,13 @@ extern void ff_snow_vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, D 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 */ |