Commit 150cc25b authored by michael's avatar michael

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2604 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 368ca651
...@@ -1937,7 +1937,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) ...@@ -1937,7 +1937,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_mmx2) SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_mmx2)
#endif #endif
#ifdef CONFIG_ENCODERS
c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2; c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2;
#endif //CONFIG_ENCODERS
} else if (mm_flags & MM_3DNOW) { } else if (mm_flags & MM_3DNOW) {
c->put_pixels_tab[0][1] = put_pixels16_x2_3dnow; c->put_pixels_tab[0][1] = put_pixels16_x2_3dnow;
c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow; c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow;
......
...@@ -4362,6 +4362,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) ...@@ -4362,6 +4362,8 @@ static void encode_picture(MpegEncContext *s, int picture_number)
} }
} }
#endif //CONFIG_ENCODERS
void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){ void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){
const int intra= s->mb_intra; const int intra= s->mb_intra;
int i; int i;
...@@ -4386,6 +4388,8 @@ void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){ ...@@ -4386,6 +4388,8 @@ void ff_denoise_dct(MpegEncContext *s, DCTELEM *block){
} }
} }
#ifdef CONFIG_ENCODERS
static int dct_quantize_trellis_c(MpegEncContext *s, static int dct_quantize_trellis_c(MpegEncContext *s,
DCTELEM *block, int n, DCTELEM *block, int n,
int qscale, int *overflow){ int qscale, int *overflow){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment