diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 21c24a2702..d36e4122a0 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -277,19 +277,6 @@ static int init(sh_video_t *sh)
            "libavcodec.size: %d x %d\n", avctx->width, avctx->height);
     switch (sh->format) {
     case mmioFOURCC('S','V','Q','3'):
-        /* SVQ3 extradata can show up as sh->ImageDesc if demux_mov is used, or
-         * in the phony AVI header if demux_lavf is used. The first case is
-         * handled here; the second case falls through to the next section. */
-        if (sh->ImageDesc) {
-            avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
-            avctx->extradata = av_mallocz(avctx->extradata_size +
-                                          FF_INPUT_BUFFER_PADDING_SIZE);
-            memcpy(avctx->extradata, ((int *)sh->ImageDesc) + 1,
-                   avctx->extradata_size);
-            break;
-        }
-    /* fallthrough */
-
     case mmioFOURCC('A','V','R','n'):
     case mmioFOURCC('M','J','P','G'):
         /* AVRn stores huffman table in AVI header */
@@ -419,14 +406,6 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt)
     width = avctx->width;
     height = avctx->height;
 
-    // HACK!
-    // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
-    // use dimensions from BIH to avoid black borders at the right and bottom.
-    if (sh->bih && sh->ImageDesc) {
-        width = sh->bih->biWidth >> avctx->lowres;
-        height = sh->bih->biHeight >> avctx->lowres;
-    }
-
     /* Reconfiguring filter/VO chain may invalidate direct rendering buffers
      * we have allocated for libavcodec (including the VDPAU HW decoding
      * case). Is it guaranteed that the code below only triggers in a situation
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 10427f8a82..f1e41f5f6e 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1266,7 +1266,6 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track,
         sh_v->disp_w = track->v_dwidth;
         sh_v->disp_h = track->v_dheight;
     }
-    sh_v->ImageDesc = NULL;
     mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Aspect: %f\n", sh_v->aspect);
 
     sh_v->ds = demuxer->video;
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 90d06f96d5..f61bf5eb58 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -160,7 +160,6 @@ typedef struct sh_video {
     // win32-compatible codec parameters:
     AVIStreamHeader video;
     BITMAPINFOHEADER *bih;
-    void *ImageDesc; // for quicktime codecs
 } sh_video_t;
 
 typedef struct sh_sub {