diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
| commit | 53eeb0e41238699fb11701c357941f904338bb25 (patch) | |
| tree | 965f3585bc690f9b5f654f1022a4c02709911706 /mencoder.c | |
| parent | b309b60a0c7230fae29475e8924ff51f107c2563 (diff) | |
| parent | 96daf7ed5ef96b86f2539164c27155bc830aa2a6 (diff) | |
| download | mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.bz2 mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.xz | |
Merge branch 'ordered_chapters'
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mencoder.c b/mencoder.c index 14c7793079..af76a90abf 100644 --- a/mencoder.c +++ b/mencoder.c @@ -575,8 +575,8 @@ if(stream->type==STREAMTYPE_DVDNAV){ } if(dvd_chapter>1) { - float pts; - if (demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0) + double pts; + if (demuxer_seek_chapter(demuxer, dvd_chapter-1, &pts, NULL) >= 0 && pts > -1.0) seek_to_sec = pts; } @@ -1471,7 +1471,7 @@ if(sh_audio && !demuxer2){ } else #endif - update_subtitles(sh_video, d_dvdsub, 0); + update_subtitles(sh_video, d_dvdsub, 0, 0); frame_data = (s_frame_data){ .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 }; |