summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2015-05-20 17:49:18 -0500
committerMichael Niedermayer <michaelni@gmx.at>2015-05-21 00:52:06 +0200
commita2aff2690b578d6e449b5435e69e43f892499750 (patch)
tree4f31ee69f7c5672c983db1af3dc555deef6e73a1 /ffmpeg_opt.c
parent642355712b970c4b17a207cc0ea42ea6adaba39f (diff)
ffmpeg: support ignoring unsupported mapped streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index a8d433eac1..e64c829d50 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -111,6 +111,7 @@ static int do_psnr = 0;
static int input_sync;
static int override_ffserver = 0;
static int input_stream_potentially_available = 0;
+static int ignore_unknown_streams = 0;
static void uninit_options(OptionsContext *o)
{
@@ -2018,9 +2019,11 @@ loop_end:
case AVMEDIA_TYPE_DATA: ost = new_data_stream (o, oc, src_idx); break;
case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc, src_idx); break;
default:
- av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n",
+ av_log(NULL, ignore_unknown_streams ? AV_LOG_FATAL : AV_LOG_WARNING,
+ "Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
- exit_program(1);
+ if (!ignore_unknown_streams)
+ exit_program(1);
}
}
}
@@ -2855,6 +2858,8 @@ const OptionDef options[] = {
"overwrite output files" },
{ "n", OPT_BOOL, { &no_file_overwrite },
"never overwrite output files" },
+ { "ignore_unknown", OPT_BOOL, { &ignore_unknown_streams },
+ "Ignore unknown stream types" },
{ "c", HAS_ARG | OPT_STRING | OPT_SPEC |
OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(codec_names) },
"codec name", "codec" },