From: Loren Merritt <lorenm@u.washington.edu>
Date: Mon, 13 Mar 2006 01:26:06 +0000 (+0000)
Subject: obey vqscale in 2nd pass
X-Git-Tag: v0.5~12982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07674d518c249e781af94a161733eee110fdc01b;p=platform%2Fupstream%2Flibav.git

obey vqscale in 2nd pass

Originally committed as revision 5157 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 876491c5d..6bd05f191 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -4053,7 +4053,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         pict->pict_type= s->m.rc_context.entry[avctx->frame_number].new_pict_type;
         s->keyframe= pict->pict_type==FF_I_TYPE;
         s->m.picture_number= avctx->frame_number;
-        pict->quality= ff_rate_estimate_qscale(&s->m, 0);
+        if(!(avctx->flags&CODEC_FLAG_QSCALE))
+            pict->quality= ff_rate_estimate_qscale(&s->m, 0);
     }else{
         s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
         pict->pict_type= s->keyframe ? FF_I_TYPE : FF_P_TYPE;