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 /mpvcore | |
| 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 'mpvcore')
| -rw-r--r-- | mpvcore/player/audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mpvcore/player/audio.c b/mpvcore/player/audio.c index a0c558f02a..e89e22c208 100644 --- a/mpvcore/player/audio.c +++ b/mpvcore/player/audio.c @@ -177,7 +177,7 @@ double written_audio_pts(struct MPContext *mpctx) return MP_NOPTS_VALUE; double bps = sh_audio->channels.num * sh_audio->samplerate * - sh_audio->samplesize; + (af_fmt2bits(sh_audio->sample_format) / 8); // first calculate the end pts of audio that has been output by decoder double a_pts = sh_audio->pts; |