From 289b3a432e010a155efbe255575abf16db3d1b71 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Wed, 31 Jan 2024 13:24:20 -0600 Subject: Revert "demux_mkv: check if the video codec is an image" This reverts commit 4709a94aec5b16534b1d6b0d6738caeaf692e9c9. --- demux/codec_tags.c | 11 ----------- demux/codec_tags.h | 1 - demux/demux_mkv.c | 4 ---- 3 files changed, 16 deletions(-) (limited to 'demux') diff --git a/demux/codec_tags.c b/demux/codec_tags.c index 923660de92..c4f07b5393 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -234,17 +234,6 @@ static const char *const type_to_codec[][2] = { {0} }; -bool mp_codec_is_image(const char *codec) -{ - if (codec) { - for (int n = 0; type_to_codec[n][0]; n++) { - if (strcasecmp(type_to_codec[n][1], codec) == 0) - return true; - } - } - return false; -} - const char *mp_map_type_to_image_codec(const char *type) { if (type) { diff --git a/demux/codec_tags.h b/demux/codec_tags.h index 8fc49df751..694f4c64d4 100644 --- a/demux/codec_tags.h +++ b/demux/codec_tags.h @@ -28,7 +28,6 @@ void mp_set_codec_from_tag(struct mp_codec_params *c); void mp_set_pcm_codec(struct mp_codec_params *c, bool sign, bool is_float, int bits, bool is_be); -bool mp_codec_is_image(const char *codec); const char *mp_map_type_to_image_codec(const char *type); const char *mp_map_mimetype_to_video_codec(const char *mimetype); diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index ddbe9c8596..40b9a1b0ad 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1526,10 +1526,6 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) } const char *codec = sh_v->codec ? sh_v->codec : ""; - if (mp_codec_is_image(codec)) { - sh->still_image = true; - sh->image = true; - } if (!strcmp(codec, "mjpeg")) { sh_v->codec_tag = MKTAG('m', 'j', 'p', 'g'); track->require_keyframes = true; -- cgit v1.2.3