diff options
| author | wm4 <wm4@nowhere> | 2013-11-09 23:22:15 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-09 23:32:58 +0100 |
| commit | 53d38278431987cc7c266e9fe84d481762bea47a (patch) | |
| tree | 675d6f2ebce175a7442724842d55f68fbe1aaf1b /demux | |
| parent | 0ff863c1797c734dde8c1f99593a01cf5e1c15bc (diff) | |
| download | mpv-53d38278431987cc7c266e9fe84d481762bea47a.tar.bz2 mpv-53d38278431987cc7c266e9fe84d481762bea47a.tar.xz | |
Remove sh_audio->samplesize
This member was redundant. sh_audio->sample_format indicates the sample
size already.
The TV code is a bit strange: the redundant sample size was part of the
internal TV interface. Assume it's really redundant and not something
else. The PCM decoder ignores the sample size anyway.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux.c | 1 | ||||
| -rw-r--r-- | demux/stheader.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/demux/demux.c b/demux/demux.c index a0164d529a..b5934824dc 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -259,7 +259,6 @@ struct sh_stream *new_sh_stream(demuxer_t *demuxer, enum stream_type type) struct sh_audio *sht = talloc_zero(demuxer, struct sh_audio); sht->gsh = sh; sht->opts = sh->opts; - sht->samplesize = 2; sht->sample_format = AF_FORMAT_S16_NE; sh->audio = sht; break; diff --git a/demux/stheader.h b/demux/stheader.h index 963bf07b5e..5aa77ba693 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 samplesize; struct mp_chmap channels; int i_bps; // == bitrate (compressed bytes/sec) // decoder buffers: |