[FFmpeg-cvslog] avcodec/mpeg_er: fix clearing chroma blocks for 422 and 444

[Marton Balint]

ffmpeg | branch: release/4.1 | Marton Balint <cus at passwd.hu> | Sat Nov 17 23:26:24 2018 +0100| [d4c5f515f09076635bf5e1591e5ff9d21ac13572] | committer: Marton Balint

avcodec/mpeg_er: fix clearing chroma blocks for 422 and 444

Fixes ticket #7494.

Signed-off-by: Marton Balint <cus at passwd.hu>
(cherry picked from commit e3a96309826dd0ea33db0300f7c75414fdbea0a4)

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

 libavcodec/mpeg_er.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mpeg_er.c b/libavcodec/mpeg_er.c
index ada1a1692f..f54cb8548b 100644
--- a/libavcodec/mpeg_er.c
+++ b/libavcodec/mpeg_er.c
@@ -78,6 +78,8 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
     ff_update_block_index(s);
 
     s->bdsp.clear_blocks(s->block[0]);
+    if (!s->chroma_y_shift)
+        s->bdsp.clear_blocks(s->block[6]);
 
     s->dest[0] = s->current_picture.f->data[0] +
                  s->mb_y * 16 * s->linesize +