From 09b7956ca596a876f19273568c7756f675b2b56e Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 25 Sep 2014 19:52:17 +0200 Subject: stream_cdda, demux_raw: always use s16le stream_cdda's output format is linked to demux_raw's default audio format, and at least we don't care enough to provide a separate mechanism to let stream_cdda explicitly set the format, so they must match. Judging from the existing code, it looks like CDDA always outputs little endian. stream_cdda.c changed this back to native endian (what demux_raw expects). Just make them both little endian. This requires less code, and also having a raw demuxer's behavior depend on the endianness of the machine isn't very sane anyway. --- demux/demux_raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_raw.c b/demux/demux_raw.c index 6faea6e61d..d054dbdf01 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -78,7 +78,7 @@ const struct m_sub_options demux_rawaudio_conf = { // Note that currently, stream_cdda expects exactly these parameters! .channels = MP_CHMAP_INIT_STEREO, .samplerate = 44100, - .aformat = PCM(1, 0, 16, NE), // s16 + .aformat = PCM(1, 0, 16, 0), // s16le }, }; -- cgit v1.2.3