diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b4076d94f2..a91a54b0dc 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -270,6 +270,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
             h_align = 4;
         }
         if (s->codec_id == AV_CODEC_ID_JV ||
+            s->codec_id == AV_CODEC_ID_ARGO ||
             s->codec_id == AV_CODEC_ID_INTERPLAY_VIDEO) {
             w_align = 8;
             h_align = 8;
@@ -300,8 +301,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
         break;
     case AV_PIX_FMT_BGR0:
         if (s->codec_id == AV_CODEC_ID_ARGO) {
-            w_align = 4;
-            h_align = 4;
+            w_align = 8;
+            h_align = 8;
         }
         break;
     default: