summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-23 23:29:54 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-23 23:29:54 +0000
commitc277e01799c50dc3b272b08a5af477ce175474b3 (patch)
treea0696495d01c1f6505b8df13e526e2f992747852 /mencoder.c
parentf1c9812c6e6300d0c004186b5388c56bdc87a101 (diff)
downloadmpv-c277e01799c50dc3b272b08a5af477ce175474b3.tar.bz2
mpv-c277e01799c50dc3b272b08a5af477ce175474b3.tar.xz
100l to oded.. edl was causing the decoder to get a first broken packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14997 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c
index fb9b6c75a0..359f3a64a1 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1330,12 +1330,13 @@ play_n_frames=play_n_frames_mf;
if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer;
#ifdef USE_EDL
+if (edl_records) free_edl(edl_records);
+next_edl_record = edl_records = NULL;
+edl_muted = 0;
+edl_seeking = 1;
+edl_skip = -1;
if (edl_filename) {
- if (edl_records) free_edl(edl_records);
next_edl_record = edl_records = edl_parse_file();
- edl_muted = 0;
- edl_seeking = 1;
- edl_skip = -1;
}
#endif