summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-19 21:46:32 +0200
committerwm4 <wm4@nowhere>2015-06-19 21:46:32 +0200
commitf2cc6ce3569e020d62580949884c00ce440c5160 (patch)
tree0cef631c57d0ec967b0804f2dcc89433f1360642 /demux
parent8b44be54e7563b5f67e4ee1c5d4b20f32164c7b7 (diff)
downloadmpv-f2cc6ce3569e020d62580949884c00ce440c5160.tar.bz2
mpv-f2cc6ce3569e020d62580949884c00ce440c5160.tar.xz
demux_mkv: do not set bitrate fields for codecs which do not need it
The only decoders I could find and which (possibly) require this field are codecs which can be used via VfW only, and realaudio sipr. For VfW we still passthrough this field.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index e4c93f93ed..441819173b 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1418,8 +1418,6 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
/* Common initialization for all RealAudio codecs */
unsigned char *src = track->private_data;
- sh_a->bitrate = 0; /* FIXME !? */
-
int version = AV_RB16(src + 4);
unsigned int flavor = AV_RB16(src + 22);
track->coded_framesize = AV_RB32(src + 24);
@@ -1530,18 +1528,14 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
const char *codec = sh->codec;
if (!strcmp(codec, "mp3")) {
- sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1152;
track->parse = true;
} else if (!strcmp(codec, "qdmc") || !strcmp(codec, "qdm2")) {
- sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1486;
} else if (!strcmp(codec, "aac")) {
- sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1024;
} else if (!strcmp(codec, "flac")) {
sh_a->bits_per_coded_sample = 0;
- sh_a->bitrate = 0;
sh_a->block_align = 0;
unsigned char *ptr = extradata;
@@ -1586,7 +1580,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->bitrate = 0;
sh_a->block_align = 0;
}