Browse Source

ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs

Currently the file overwrite check does not work for paths that
contain a colon.

Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.

Fix remaining part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
tags/n2.2-rc1
Alexander Strasser 11 years ago
parent
commit
2b17c7685f
1 changed files with 3 additions and 4 deletions
  1. +3
    -4
      ffmpeg_opt.c

+ 3
- 4
ffmpeg_opt.c View File

@@ -697,10 +697,9 @@ static void assert_file_overwrite(const char *filename)
exit_program(1);
}

if (!file_overwrite &&
(strchr(filename, ':') == NULL || filename[1] == ':' ||
av_strstart(filename, "file:", NULL))) {
if (avio_check(filename, 0) == 0) {
if (!file_overwrite) {
const char *proto_name = avio_find_protocol_name(filename);
if (proto_name && !strcmp(proto_name, "file") && avio_check(filename, 0) == 0) {
if (stdin_interaction && !no_file_overwrite) {
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
fflush(stderr);


Loading…
Cancel
Save