diff options
| author | wm4 <wm4@nowhere> | 2012-09-01 20:14:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
| commit | dd3e1217eb2086a9d759332bdca8b9399b565d72 (patch) | |
| tree | 445ed03113e3032ac70f46075604789d7138add3 /libmpdemux/demux_mkv.c | |
| parent | f0b2c3dcd79885ed6c2e407b9d6d474968da8813 (diff) | |
| download | mpv-dd3e1217eb2086a9d759332bdca8b9399b565d72.tar.bz2 mpv-dd3e1217eb2086a9d759332bdca8b9399b565d72.tar.xz | |
demuxer: remove ImageDesc field
This was needed by the now-removed mov demuxer for QuickTime video, or
to be more specific, the Sorenson 3 video codec. QuickTime can
(probably) still decoded by libavcodec, but this field is not needed
for this.
The reference in demux_mkv was apparently for decoding QuickTime in
Matroska, using binary QuickTime codecs (QTX stuff). It's possible that
this has been broken with the binary codecs removal (see commit
aebfbbf2bdd), because it removed related code from demux_mkv. On the
other hand, the code section in question was enabled only if binary
win32 codecs were enabled. The win32 codec loader worked on 32 bit x86
only. This means QuickTime-in-Matroska was broken on all other
architectures, including 64 bit x86. Despite being possibly broken on a
major platform, nobody has complained about it yet, and since I couldn't
find a sample of such a mkv file, so don't bother with it.
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 1 |
1 files changed, 0 insertions, 1 deletions
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; |