diff options
author | wm4 <wm4@nowhere> | 2012-12-12 23:05:57 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-12-12 23:05:57 +0100 |
commit | b0558e48b184cb9a4555d8156d86bebe2315690f (patch) | |
tree | 39c8c25d91402109b8bfaef9007efca6478b5666 | |
parent | 306136a287b767d33f20678b34a60d6fef60fe9f (diff) | |
download | mpv-b0558e48b184cb9a4555d8156d86bebe2315690f.tar.bz2 mpv-b0558e48b184cb9a4555d8156d86bebe2315690f.tar.xz |
cleanup: remove ao.brokenpts
This field was used by ao_v4l2, and is now unused.
-rw-r--r-- | audio/out/ao.h | 1 | ||||
-rw-r--r-- | core/mplayer.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h index 2a7d15ae08..6ea1b22cd2 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -96,7 +96,6 @@ struct ao { int bps; int outburst; int buffersize; - int brokenpts; double pts; struct bstr buffer; int buffer_playable_size; diff --git a/core/mplayer.c b/core/mplayer.c index e18acf9eac..c68c4f3dc2 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -2156,9 +2156,6 @@ static int write_to_ao(struct MPContext *mpctx, void *data, int len, int flags, struct ao *ao = mpctx->ao; double bps = ao->bps / mpctx->opts.playback_speed; ao->pts = pts; - // hack used by some mpeg-writing AOs - ao->brokenpts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + - mpctx->delay) * 90000.0; int played = ao_play(mpctx->ao, data, len, flags); if (played > 0) { mpctx->delay += played / bps; @@ -2269,10 +2266,6 @@ static int fill_audio_out_buffers(struct MPContext *mpctx, double endpts) bool modifiable_audio_format = !(ao->format & AF_FORMAT_SPECIAL_MASK); int unitsize = ao->channels * af_fmt2bits(ao->format) / 8; - // hack used by some mpeg-writing AOs - ao->brokenpts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + - mpctx->delay) * 90000.0; - if (mpctx->paused) playsize = 1; // just initialize things (audio pts at least) else |