From 30d770ca448131fba207d9603ff438dea15d10ba Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 Dec 2015 16:27:52 +0100 Subject: ffmpeg: Allow specifying the program number for created programs Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'ffmpeg_opt.c') diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index fd2c0517cf..3df46da15e 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2418,8 +2418,27 @@ loop_end: for (i = 0; i < o->nb_program; i++) { const char *p = o->program[i].u.str; int progid = i+1; - AVProgram *program = av_new_program(oc, progid); + AVProgram *program; + while(*p) { + const char *p2 = av_get_token(&p, ":"); + char *key; + if (!p2) + break; + if(*p) p++; + + key = av_get_token(&p2, "="); + if (!key || !*p2) + break; + p2++; + + if (!strcmp(key, "program_num")) + progid = strtol(p2, NULL, 0); + } + + program = av_new_program(oc, progid); + + p = o->program[i].u.str; while(*p) { const char *p2 = av_get_token(&p, ":"); char *key; @@ -2440,6 +2459,7 @@ loop_end: if (!strcmp(key, "title")) { av_dict_set(&program->metadata, "title", p2, 0); + } else if (!strcmp(key, "program_num")) { } else if (!strcmp(key, "st")) { int st_num = strtol(p2, NULL, 0); av_program_add_stream_index(oc, progid, st_num); -- cgit v1.2.3