Browse Source

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
tags/v0.5
Guillaume Poirier 19 years ago
parent
commit
696e1bb36e
2 changed files with 9 additions and 1 deletions
  1. +4
    -0
      libavcodec/mpegvideo.h
  2. +5
    -1
      libavcodec/snow.h

+ 4
- 0
libavcodec/mpegvideo.h View File

@@ -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);


+ 5
- 1
libavcodec/snow.h View File

@@ -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 */



Loading…
Cancel
Save