diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2003-12-13 02:14:18 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-12-13 02:14:18 +0000 |
| commit | 0c11692a1d0fb006713c2174809ba60985f4a28e (patch) | |
| tree | d62db40f849b2366876702cc07ec5e695e354b62 | |
| parent | 864119b6caa120c0dd9b9ad9a0ceea59fcbdd23f (diff) | |
| download | ffmpeg-0c11692a1d0fb006713c2174809ba60985f4a28e.tar.gz | |
Here are juste two added #ifdef CONFIG_ENCODERS to allow
libavcodec to compile without CONFIG_ENCODERS defined
patch by (Aurelien Jacobs <aurel at gnuage dot org>)
Originally committed as revision 2604 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index ecaecaa83d..faafca223f 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -1937,7 +1937,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_mmx2) #endif +#ifdef CONFIG_ENCODERS c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2; +#endif //CONFIG_ENCODERS } else if (mm_flags & MM_3DNOW) { c->put_pixels_tab[0][1] = put_pixels16_x2_3dnow; c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2f214862c7..18a5b3b1fc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -4362,6 +4362,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) } } +#endif //CONFIG_ENCODERS + void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){ const int intra= s->mb_intra; int i; @@ -4386,6 +4388,8 @@ void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){ } } +#ifdef CONFIG_ENCODERS + static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow){ |