Mercurial > libavcodec.hg
changeset 5275:91416b4f1929 libavcodec
Better place to disable some mpeg4 code and ensure that
ff_write_quant_matrix() won't be used when mpeg4 encoder is disabled.
author | aurel |
---|---|
date | Tue, 10 Jul 2007 17:31:17 +0000 |
parents | c6bc608d2659 |
children | 0d71d658b19f |
files | h263.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Tue Jul 10 17:17:42 2007 +0000 +++ b/h263.c Tue Jul 10 17:31:17 2007 +0000 @@ -2347,6 +2347,8 @@ { int vo_ver_id; + if (!ENABLE_MPEG4_ENCODER) return; + if(s->max_b_frames || s->quarter_sample){ vo_ver_id= 5; s->vo_type= ADV_SIMPLE_VO_TYPE; @@ -2448,8 +2450,6 @@ int time_incr; int time_div, time_mod; - if (!ENABLE_MPEG4_ENCODER) return; - if(s->pict_type==I_TYPE){ if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy