From b789acee21ea9c7e83a7451e060f210b1b8ef91d Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 19 Jun 2015 21:47:11 +0200 Subject: demux_mkv: do not set block_align for codecs which do not need it These decoders do not reference it. I suspect this was originally done for the sake for MPlayer's vfw/dshow wrappers. --- demux/demux_mkv.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'demux') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 441819173b..bb4fef25a6 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1528,15 +1528,9 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) const char *codec = sh->codec; if (!strcmp(codec, "mp3")) { - sh_a->block_align = 1152; track->parse = true; - } else if (!strcmp(codec, "qdmc") || !strcmp(codec, "qdm2")) { - sh_a->block_align = 1486; - } else if (!strcmp(codec, "aac")) { - sh_a->block_align = 1024; } else if (!strcmp(codec, "flac")) { sh_a->bits_per_coded_sample = 0; - sh_a->block_align = 0; unsigned char *ptr = extradata; unsigned int size = extradata_len; @@ -1580,7 +1574,6 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) !strcmp(codec, "dts")) { sh_a->bits_per_coded_sample = 0; - sh_a->block_align = 0; } // Some files have broken default DefaultDuration set, which will lead to -- cgit v1.2.3