Commit 7cd33978 authored by michael's avatar michael

-1 is a valid return value in ratecontrol_1pass() -> 100l for takis


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6677 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 41697583
...@@ -3876,7 +3876,7 @@ static int ratecontrol_1pass(SnowContext *s, AVFrame *pict) ...@@ -3876,7 +3876,7 @@ static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
pict->quality= ff_rate_estimate_qscale(&s->m, 1); pict->quality= ff_rate_estimate_qscale(&s->m, 1);
if (pict->quality < 0) if (pict->quality < 0)
return -1; return INT_MIN;
s->lambda= pict->quality * 3/2; s->lambda= pict->quality * 3/2;
delta_qlog= qscale2qlog(pict->quality) - s->qlog; delta_qlog= qscale2qlog(pict->quality) - s->qlog;
s->qlog+= delta_qlog; s->qlog+= delta_qlog;
...@@ -4186,7 +4186,7 @@ redo_frame: ...@@ -4186,7 +4186,7 @@ redo_frame:
if(s->pass1_rc && plane_index==0){ if(s->pass1_rc && plane_index==0){
int delta_qlog = ratecontrol_1pass(s, pict); int delta_qlog = ratecontrol_1pass(s, pict);
if (delta_qlog < 0) if (delta_qlog <= INT_MIN)
return -1; return -1;
if(delta_qlog){ if(delta_qlog){
//reordering qlog in the bitstream would eliminate this reset //reordering qlog in the bitstream would eliminate this reset
......
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