[FFmpeg-cvslog] avcodec/h261dec: Don't set write-only macroblock dimensions

Andreas Rheinhardt git at videolan.org
Sun Oct 15 00:51:09 EEST 2023


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Oct  6 23:40:19 2023 +0200| [66908a43e2fd171178e4bcdf80596545f443e815] | committer: Andreas Rheinhardt

avcodec/h261dec: Don't set write-only macroblock dimensions

They are generally set in ff_mpv_init_context_frame()
(mostly called by ff_mpv_common_init()); setting them
somewhere else should be avoided.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66908a43e2fd171178e4bcdf80596545f443e815
---

 libavcodec/h261dec.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index e227c1785e..8a823793e5 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -527,17 +527,11 @@ static int h261_decode_picture_header(H261DecContext *h)
     if (format == 0) { // QCIF
         s->width     = 176;
         s->height    = 144;
-        s->mb_width  = 11;
-        s->mb_height = 9;
     } else { // CIF
         s->width     = 352;
         s->height    = 288;
-        s->mb_width  = 22;
-        s->mb_height = 18;
     }
 
-    s->mb_num = s->mb_width * s->mb_height;
-
     skip_bits1(&s->gb); /* still image mode off */
     skip_bits1(&s->gb); /* Reserved */
 



More information about the ffmpeg-cvslog mailing list