From 66a9eb570d8ab086ecd29c244dc99c5c6b85cd03 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 16 Jul 2013 22:44:15 +0200 Subject: demux_mkv: never force output sample rate Matroska has an output sample rate (OutputSamplingFrequency), which in theory should be forced instead of whatever the decoder outputs. But it appears no software (other than mplayer2 and mpv until now) actually respects this. Even worse, there were broken files around, which played correctly with (in theory) broken software, but not mplayer2/mpv. Hacks were added to our code to play these files correctly, but they didn't catch all cases. Simplify this by doing what everyone else does, and always use the decoder's sample rate instead. In particular, we try to handle all sample rate issues like libavformat's Matroska demuxer does. --- demux/stheader.h | 1 - 1 file changed, 1 deletion(-) (limited to 'demux/stheader.h') diff --git a/demux/stheader.h b/demux/stheader.h index 3b9c47ba2c..e90909e17a 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -90,7 +90,6 @@ typedef struct sh_audio { // output format: int sample_format; int samplerate; - int container_out_samplerate; int samplesize; struct mp_chmap channels; int i_bps; // == bitrate (compressed bytes/sec) -- cgit v1.2.3