Fix EDL to be per file, allow -edlout and -edl together as there is really

no reason not to.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17110 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 0 insertions, 18 deletions

diff --git a/edl.c b/edl.c
index 0433b68bc1..489d4a748a 100644
--- a/edl.c
+++ b/edl.c
@@ -11,24 +11,6 @@ char *edl_output_filename; // file to put EDL entries in (-edlout)
 #ifdef USE_EDL
 
 /**
- *  We can't do -edl and -edlout at the same time
- *  so we check that here.
- *
- *  \return EDL_ERROR on error and 1 otherwise.
- *  \brief Makes sure EDL has been called correctly.
- */
-
-int edl_check_mode(void)
-{
-    if (edl_filename && edl_output_filename)
-    {
-        return (EDL_ERROR);
-    }
-
-    return (1);
-}
-
-/**
  *  Allocates a new EDL record and makes sure allocation was successful.
  *
  *  \return New allocated EDL record.