Mercurial > libavcodec.hg

comparison ratecontrol.c @ 5203:d71791d72286 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CONFIG_XVID --> CONFIG_LIBXVID
author diego
date Tue, 03 Jul 2007 09:12:55 +0000
parents 4dbe6578f811
children 20bea6a9950c
comparison
equal deleted inserted replaced
5202:07005ff96430 5203:d71791d72286
182 182
183 if(init_pass2(s) < 0) return -1; 183 if(init_pass2(s) < 0) return -1;
184 184
185 //FIXME maybe move to end 185 //FIXME maybe move to end
186 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) { 186 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
187 #ifdef CONFIG_XVID 187 #ifdef CONFIG_LIBXVID
188 return ff_xvid_rate_control_init(s); 188 return ff_xvid_rate_control_init(s);
189 #else 189 #else
190 av_log(s->avctx, AV_LOG_ERROR, "XviD ratecontrol requires libavcodec compiled with XviD support\n"); 190 av_log(s->avctx, AV_LOG_ERROR, "XviD ratecontrol requires libavcodec compiled with XviD support\n");
191 return -1; 191 return -1;
192 #endif 192 #endif
258 emms_c(); 258 emms_c();
259 259
260 ff_eval_free(rcc->rc_eq_eval); 260 ff_eval_free(rcc->rc_eq_eval);
261 av_freep(&rcc->entry); 261 av_freep(&rcc->entry);
262 262
263 #ifdef CONFIG_XVID 263 #ifdef CONFIG_LIBXVID
264 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) 264 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
265 ff_xvid_rate_control_uninit(s); 265 ff_xvid_rate_control_uninit(s);
266 #endif 266 #endif
267 } 267 }
268 268
674 int var; 674 int var;
675 const int pict_type= s->pict_type; 675 const int pict_type= s->pict_type;
676 Picture * const pic= &s->current_picture; 676 Picture * const pic= &s->current_picture;
677 emms_c(); 677 emms_c();
678 678
679 #ifdef CONFIG_XVID 679 #ifdef CONFIG_LIBXVID
680 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) 680 if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
681 return ff_xvid_rate_estimate_qscale(s, dry_run); 681 return ff_xvid_rate_estimate_qscale(s, dry_run);
682 #endif 682 #endif
683 683
684 get_qminmax(&qmin, &qmax, s, pict_type); 684 get_qminmax(&qmin, &qmax, s, pict_type);