virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Better place to disable some mpeg4 code and ensure that

Browse Source 
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
This commit is contained in:
Aurelien Jacobs 2007-07-10 17:31:17 +00:00
parent 898d5d5daa
commit 99439cb72c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h263.c
View File

@ -2347,6 +2347,8 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
{ {
int vo_ver_id; int vo_ver_id;
if (!ENABLE_MPEG4_ENCODER) return;
if(s->max_b_frames || s->quarter_sample){ if(s->max_b_frames || s->quarter_sample){
vo_ver_id= 5; vo_ver_id= 5;
s->vo_type= ADV_SIMPLE_VO_TYPE; 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_incr;
int time_div, time_mod; int time_div, time_mod;
if (!ENABLE_MPEG4_ENCODER) return;
if(s->pict_type==I_TYPE){ if(s->pict_type==I_TYPE){
if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){
if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy