diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-12 15:51:15 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-12 15:51:15 +0000 |
commit | aa5ecdffd5e03ae9002d2a38ac3306c2d63a3fa7 (patch) | |
tree | 273eb5d7bdef9d913e61c9115e407188fcf9027c /libmpdemux | |
parent | dd4bde7bc3be8fe4849e5ee41e1a55af75549f7c (diff) | |
download | mpv-aa5ecdffd5e03ae9002d2a38ac3306c2d63a3fa7.tar.bz2 mpv-aa5ecdffd5e03ae9002d2a38ac3306c2d63a3fa7.tar.xz |
demux_real.c: Always use MP_NOPTS_VALUE for unknown pts
demux_real.c still had code that used either 0 or MP_NOPTS_VALUE for
unknown timestamps depending on correct_pts setting. It should have
been removed in svn commit 25988 "Change to always use MP_NOPTS_VALUE
(instead of sometimes 0) for unknown pts.".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26413 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_real.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 7554363b25..d48af16413 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -741,7 +741,7 @@ got_audio: break; } priv->audio_need_keyframe = 0; - priv->audio_timestamp[priv->sub_packet_cnt] = (priv->a_pts==timestamp) ? (user_correct_pts > 0 ? MP_NOPTS_VALUE : 0) : (timestamp/1000.0); + priv->audio_timestamp[priv->sub_packet_cnt] = (priv->a_pts==timestamp) ? MP_NOPTS_VALUE : (timestamp/1000.0); priv->a_pts = timestamp; if (priv->sub_packet_cnt == 0) priv->audio_filepos = demuxer->filepos; |