From b776e3d11b9951f9a67aa19239ee1d02f773bbd0 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 9 Jul 2007 21:07:24 +0000 Subject: [PATCH] move ff_set_qscale from h263.c to mpegvideo.c Originally committed as revision 9567 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.c | 17 ----------------- libavcodec/mpegvideo.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 7a57ae9645..7446bda6be 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -2516,23 +2516,6 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) #endif //CONFIG_ENCODERS -/** - * set qscale and update qscale dependent variables. - */ -void ff_set_qscale(MpegEncContext * s, int qscale) -{ - if (qscale < 1) - qscale = 1; - else if (qscale > 31) - qscale = 31; - - s->qscale = qscale; - s->chroma_qscale= s->chroma_qscale_table[qscale]; - - s->y_dc_scale= s->y_dc_scale_table[ qscale ]; - s->c_dc_scale= s->c_dc_scale_table[ s->chroma_qscale ]; -} - /** * predicts the dc. * encoding quantized level -> quantized diff diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 68ee6125d1..01369da8fc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2352,3 +2352,19 @@ static void dct_unquantize_h263_inter_c(MpegEncContext *s, } } +/** + * set qscale and update qscale dependent variables. + */ +void ff_set_qscale(MpegEncContext * s, int qscale) +{ + if (qscale < 1) + qscale = 1; + else if (qscale > 31) + qscale = 31; + + s->qscale = qscale; + s->chroma_qscale= s->chroma_qscale_table[qscale]; + + s->y_dc_scale= s->y_dc_scale_table[ qscale ]; + s->c_dc_scale= s->c_dc_scale_table[ s->chroma_qscale ]; +}