diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-10 17:31:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-10 17:31:17 +0000 |
| commit | 99439cb72c51725aaf412d84049804a54ea5754b (patch) | |
| tree | 8c467306f4833b52181ac90bc44f06513fe077cd /libavcodec/h263.c | |
| parent | 898d5d5daa9ddce8242e464205ed41113ef87119 (diff) | |
| download | ffmpeg-99439cb72c51725aaf412d84049804a54ea5754b.tar.gz | |
Better place to disable some mpeg4 code and ensure that
ff_write_quant_matrix() won't be used when mpeg4 encoder is disabled.
Originally committed as revision 9579 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 43ec7964cc..dedaa18a20 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -2347,6 +2347,8 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n { 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 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) 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 |