diff options
author | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
commit | e4bbb1d348dafbb32722f413648006a7bd9d0897 (patch) | |
tree | 7165ed9f86a77b751187600d0a9de8b35416f380 /demux | |
parent | e4f2fcc0ecd31322df65141edf0ddbff9c075f5d (diff) | |
parent | 22b3f522cacfbdba76d311c86efd6091512eb089 (diff) | |
download | mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.bz2 mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.xz |
Merge branch 'planar_audio'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux.c | 1 | ||||
-rw-r--r-- | demux/stheader.h | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/demux/demux.c b/demux/demux.c index 4e5f83f8ab..da5957efdd 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -255,7 +255,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->sample_format = AF_FORMAT_S16_NE; sh->audio = sht; break; } diff --git a/demux/stheader.h b/demux/stheader.h index 5aa77ba693..c88ed0b0f7 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -92,11 +92,8 @@ typedef struct sh_audio { int samplerate; struct mp_chmap channels; int i_bps; // == bitrate (compressed bytes/sec) - // decoder buffers: - int audio_out_minsize; // minimal output from decoder may be this much - char *a_buffer; // buffer for decoder output - int a_buffer_len; - int a_buffer_size; + // decoder state: + struct mp_audio_buffer *decode_buffer; struct af_stream *afilter; // the audio filter stream const struct ad_functions *ad_driver; // win32-compatible codec parameters: @@ -104,7 +101,7 @@ typedef struct sh_audio { // note codec extradata may be either under "wf" or "codecdata" unsigned char *codecdata; int codecdata_len; - int pts_bytes; // bytes output by decoder after last known pts + int pts_offset; // number of samples output by decoder after last known pts } sh_audio_t; typedef struct sh_video { |