avcodec/mpegvideo_enc: Defer initialization of mb-pos dependent vars

Only set them after mb_x and mb_y are known which happens only after the call to ff_h261_reorder_mb_index().

Andreas Rheinhardt committed 1 year ago

Commit d5fba4a1 parent 854a3ed1 file · +4 −6Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

         ff_init_block_index(&s->c);
         for (int mb_x = 0; mb_x < s->c.mb_width; mb_x++) {
-            int xy = mb_y*s->c.mb_stride + mb_x; // removed const, H261 needs to adjust this
+            int mb_type, xy;
-            int mb_type= s->mb_type[xy];
 //            int d;
             int dmin= INT_MAX;
             int dir;
             s->c.mb_y = mb_y;  // moved into loop, can get changed by H.261
             ff_update_block_index(&s->c, 8, 0, s->c.chroma_x_shift);
-            if (CONFIG_H261_ENCODER && s->c.codec_id == AV_CODEC_ID_H261) {
+            if (CONFIG_H261_ENCODER && s->c.codec_id == AV_CODEC_ID_H261)
                 ff_h261_reorder_mb_index(s);
-                xy = s->c.mb_y*s->c.mb_stride + s->c.mb_x;
+            xy      = s->c.mb_y * s->c.mb_stride + s->c.mb_x;
-                mb_type= s->mb_type[xy];
+            mb_type = s->mb_type[xy];
-            }
             /* write gob / video packet header  */
             if(s->rtp_mode){

Keyboard shortcuts