comparison h263.c @ 699:f69f9cb461bc libavcodec

automatically detect broken opendivx codec and workaround, so bug=1 shouldnt be needed anymore for mpeg4 files, if there still are files which need bug=1 then tell me ...

698:e050a053e259

                s->new_pred=0;
                s->reduced_res_vop= 0;
            }

            s->scalability= get_bits1(&s->gb);
            if(s->workaround_bugs==1) s->scalability=0;
            if (s->scalability) {
                int dummy= s->hierachy_type= get_bits1(&s->gb);
                int ref_layer_id= get_bits(&s->gb, 4);
                int ref_layer_sampling_dir= get_bits1(&s->gb);
                int h_sampling_factor_n= get_bits(&s->gb, 5);
                int h_sampling_factor_m= get_bits(&s->gb, 5);
                int v_sampling_factor_n= get_bits(&s->gb, 5);
                int v_sampling_factor_m= get_bits(&s->gb, 5);
                s->enhancement_type= get_bits1(&s->gb);
                // bin shape stuff FIXME
                printf("scalability not supported\n");
            }
        }
//printf("end Data %X %d\n", show_bits(&s->gb, 32), get_bits_count(&s->gb)&0x7);

699:f69f9cb461bc

                s->new_pred=0;
                s->reduced_res_vop= 0;
            }

            s->scalability= get_bits1(&s->gb);

            if (s->scalability) {
                GetBitContext bak= s->gb;
                int dummy= s->hierachy_type= get_bits1(&s->gb);
                int ref_layer_id= get_bits(&s->gb, 4);
                int ref_layer_sampling_dir= get_bits1(&s->gb);
                int h_sampling_factor_n= get_bits(&s->gb, 5);
                int h_sampling_factor_m= get_bits(&s->gb, 5);
                int v_sampling_factor_n= get_bits(&s->gb, 5);
                int v_sampling_factor_m= get_bits(&s->gb, 5);
                s->enhancement_type= get_bits1(&s->gb);
                
                if(   h_sampling_factor_n==0 || h_sampling_factor_m==0 
                   || v_sampling_factor_n==0 || v_sampling_factor_m==0 || s->workaround_bugs==1){
                   
                    fprintf(stderr, "illegal scalability header (VERY broken encoder), trying to workaround\n");
                    s->scalability=0;
                   
                    s->gb= bak;
                    goto redo;
                }
                
                // bin shape stuff FIXME
                printf("scalability not supported\n");
            }
        }
//printf("end Data %X %d\n", show_bits(&s->gb, 32), get_bits_count(&s->gb)&0x7);