[vlc-commits] mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 30 18:31:35 2012 +0200| [3ce813b2e492c82bdac9baa69932ea816b68d220] | committer: Rémi Denis-Courmont

mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME

(cherry picked from commit 9002730fbd83123aae1f69f162e4275f595f9f9e)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3ce813b2e492c82bdac9baa69932ea816b68d220
---

 modules/demux/mkv/matroska_segment.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 311c08d..bc99aa6 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -728,11 +728,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
         }
     }
 
-#ifndef WIN32
     /* Don't try complex seek if we seek to 0 */
     if( i_date == 0 )
     {
-        es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, 0 );
+        es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+                        INT64_C(0) );
         es_out_Control( sys.demuxer.out, ES_OUT_SET_PCR, VLC_TS_0 );
         es.I_O().setFilePointer( i_start_pos );
 
@@ -744,7 +744,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
         sys.i_pcr = 0;
         return;       
     }
-#endif
 
     int i_idx = 0;
     if ( i_index > 0 )