Mercurial > mplayer.hg
comparison mencoder.c @ 14996:576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
author | rfelker |
---|---|
date | Wed, 23 Mar 2005 23:29:54 +0000 |
parents | 92e234f53156 |
children | 265d8b8adbbe |
comparison
equal
deleted
inserted
replaced
14995:0ac4446da7eb | 14996:576b810a034d |
---|---|
1328 | 1328 |
1329 play_n_frames=play_n_frames_mf; | 1329 play_n_frames=play_n_frames_mf; |
1330 if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer; | 1330 if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer; |
1331 | 1331 |
1332 #ifdef USE_EDL | 1332 #ifdef USE_EDL |
1333 if (edl_records) free_edl(edl_records); | |
1334 next_edl_record = edl_records = NULL; | |
1335 edl_muted = 0; | |
1336 edl_seeking = 1; | |
1337 edl_skip = -1; | |
1333 if (edl_filename) { | 1338 if (edl_filename) { |
1334 if (edl_records) free_edl(edl_records); | |
1335 next_edl_record = edl_records = edl_parse_file(); | 1339 next_edl_record = edl_records = edl_parse_file(); |
1336 edl_muted = 0; | |
1337 edl_seeking = 1; | |
1338 edl_skip = -1; | |
1339 } | 1340 } |
1340 #endif | 1341 #endif |
1341 | 1342 |
1342 while(!at_eof){ | 1343 while(!at_eof){ |
1343 | 1344 |