From e174d31fdda78374600878699ef911fd09f55a26 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 23 Nov 2013 21:25:05 +0100 Subject: audio: don't write decoded audio format to sh_audio sh_audio is supposed to contain file headers, not whatever was decoded. Fix this, and write the decoded format to separate fields in the decoder context, the dec_audio.decoded field. (Note that this field is really only needed to communicate the audio format from decoder driver to the generic code, so no other code accesses it.) --- demux/stheader.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'demux') diff --git a/demux/stheader.h b/demux/stheader.h index ab190cca83..eb7c3d132b 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -87,8 +87,6 @@ struct sh_stream { typedef struct sh_audio { SH_COMMON - // output format: - int sample_format; int samplerate; struct mp_chmap channels; int i_bps; // == bitrate (compressed bytes/sec) -- cgit v1.2.3