# HG changeset patch
# User aurel
# Date 1184088677 0
# Node ID 91416b4f1929ee03a837d3b04ba649bd6a797be4
# Parent  c6bc608d265998c756cc8e8c25cbf325915244c8
Better place to disable some mpeg4 code and ensure that
ff_write_quant_matrix() won't be used when mpeg4 encoder is disabled.

diff -r c6bc608d2659 -r 91416b4f1929 h263.c
--- 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