diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:45:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:45:33 +0200 |
| commit | 1a59a288380ab208914c5e8d94f688a6f75954ae (patch) | |
| tree | 07ed351a61157830f002cdc09186d4ea7c959cc8 | |
| parent | aecd064744c846faf7c7df76d0ecca720f314e52 (diff) | |
| parent | fcf597625c7a991ca389f3a9b8ff4f5e383301c0 (diff) | |
| download | ffmpeg-1a59a288380ab208914c5e8d94f688a6f75954ae.tar.gz | |
Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'
* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0':
ismindex: Avoid writing ismf files if no base name has been specified
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/ismindex.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index 258f8284aa..d66a389e0e 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -681,6 +681,8 @@ int main(int argc, char **argv) } else if (argv[i][0] == '-') { return usage(argv[0], 1); } else { + if (!basename) + ismf = 0; if (handle_file(&tracks, argv[i], split, ismf, basename, output_prefix)) return 1; |