summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-08 00:45:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-08 00:45:33 +0200
commit1a59a288380ab208914c5e8d94f688a6f75954ae (patch)
tree07ed351a61157830f002cdc09186d4ea7c959cc8 /tools
parentaecd064744c846faf7c7df76d0ecca720f314e52 (diff)
parentfcf597625c7a991ca389f3a9b8ff4f5e383301c0 (diff)
downloadffmpeg-streaming-1a59a288380ab208914c5e8d94f688a6f75954ae.zip
ffmpeg-streaming-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>
Diffstat (limited to 'tools')
-rw-r--r--tools/ismindex.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c
index 258f828..d66a389 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;
OpenPOWER on IntegriCloud