RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-23 07:43:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '052b97855de2396e46682bcbae97f95a258816d4'

Browse Source 
* commit '052b97855de2396e46682bcbae97f95a258816d4':
  aviocat: Support avio options

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-24 13:07:50 +01:00
commit d1ab8c66cf
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/aviocat.c
View File

@ -26,7 +26,8 @@
static int usage(const char *argv0, int ret) static int usage(const char *argv0, int ret)
{ {
fprintf(stderr, "%s [-b bytespersec] [-d duration] input_url output_url\n", argv0); fprintf(stderr, "%s [-b bytespersec] [-d duration] [-oi <options>] [-oo <options>] input_url output_url\n", argv0);
fprintf(stderr, "<options>: AVOptions expressed as key=value, :-separated\n");
return ret; return ret;
} }
@ -38,6 +39,8 @@ int main(int argc, char **argv)
int64_t start_time; int64_t start_time;
char errbuf[50]; char errbuf[50];
AVIOContext *input, *output; AVIOContext *input, *output;
AVDictionary *in_opts = NULL;
AVDictionary *out_opts = NULL;
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();
@ -49,6 +52,20 @@ int main(int argc, char **argv)
} else if (!strcmp(argv[i], "-d") && i + 1 < argc) { } else if (!strcmp(argv[i], "-d") && i + 1 < argc) {
duration = atoi(argv[i + 1]); duration = atoi(argv[i + 1]);
i++; i++;
} else if (!strcmp(argv[i], "-oi") && i + 1 < argc) {
if (av_dict_parse_string(&in_opts, argv[i + 1], "=", ":", 0) < 0) {
fprintf(stderr, "Cannot parse option string %s\n",
argv[i + 1]);
return usage(argv[0], 1);
}
i++;
} else if (!strcmp(argv[i], "-oo") && i + 1 < argc) {
if (av_dict_parse_string(&out_opts, argv[i + 1], "=", ":", 0) < 0) {
fprintf(stderr, "Cannot parse option string %s\n",
argv[i + 1]);
return usage(argv[0], 1);
}
i++;
} else if (!input_url) { } else if (!input_url) {
input_url = argv[i]; input_url = argv[i];
} else if (!output_url) { } else if (!output_url) {
@ -60,7 +77,7 @@ int main(int argc, char **argv)
if (!output_url) if (!output_url)
return usage(argv[0], 1); return usage(argv[0], 1);
ret = avio_open2(&input, input_url, AVIO_FLAG_READ, NULL, NULL); ret = avio_open2(&input, input_url, AVIO_FLAG_READ, NULL, &in_opts);
if (ret) { if (ret) {
av_strerror(ret, errbuf, sizeof(errbuf)); av_strerror(ret, errbuf, sizeof(errbuf));
fprintf(stderr, "Unable to open %s: %s\n", input_url, errbuf); fprintf(stderr, "Unable to open %s: %s\n", input_url, errbuf);
@ -75,7 +92,7 @@ int main(int argc, char **argv)
} }
bps = size / duration; bps = size / duration;
} }
ret = avio_open2(&output, output_url, AVIO_FLAG_WRITE, NULL, NULL); ret = avio_open2(&output, output_url, AVIO_FLAG_WRITE, NULL, &out_opts);
if (ret) { if (ret) {
av_strerror(ret, errbuf, sizeof(errbuf)); av_strerror(ret, errbuf, sizeof(errbuf));
fprintf(stderr, "Unable to open %s: %s\n", output_url, errbuf); fprintf(stderr, "Unable to open %s: %s\n", output_url, errbuf);
@ -102,6 +119,8 @@ int main(int argc, char **argv)
avio_close(output); avio_close(output);
fail: fail:
av_dict_free(&in_opts);
av_dict_free(&out_opts);
avio_close(input); avio_close(input);
avformat_network_deinit(); avformat_network_deinit();
return ret ? 1 : 0; return ret ? 1 : 0;