Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'

* commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c':
  svq3: rip out the mb decoding code shared with h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/svq3.c
index fda8300,7aab4e0..bf9e591
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -1342,8 -1413,8 +1454,8 @@@ static int svq3_decode_frame(AVCodecCon
                  return -1;
              }
  
 -            if (mb_type != 0)
 +            if (mb_type != 0 || sl->cbp)
-                 ff_h264_hl_decode_mb(h, &h->slice_ctx[0]);
+                 hl_decode_mb(h, &h->slice_ctx[0]);
  
              if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
                  h->cur_pic.mb_type[sl->mb_x + sl->mb_y * h->mb_stride] =