Browse Source

ffprobe: prefer av_strtok() over av_get_token() for parsing print_format string

Simplify, and avoid the need for multiple escaping levels.
tags/n0.9
Stefano Sabatini 13 years ago
parent
commit
b874e2d0a0
1 changed files with 9 additions and 16 deletions
  1. +9
    -16
      ffprobe.c

+ 9
- 16
ffprobe.c View File

@@ -809,26 +809,20 @@ static int probe_file(const char *filename)
AVFormatContext *fmt_ctx; AVFormatContext *fmt_ctx;
int ret; int ret;
Writer *w; Writer *w;
const char *buf = print_format;
char *w_str = NULL, *w_args = NULL;
char *buf;
char *w_name = NULL, *w_args = NULL;
WriterContext *wctx; WriterContext *wctx;


writer_register_all(); writer_register_all();


if (buf) {
w_str = av_get_token(&buf, "=");
if (*buf == '=') {
buf++;
w_args = av_get_token(&buf, "");
}
}

if (!w_str)
w_str = av_strdup("default");
if (!print_format)
print_format = av_strdup("default");
w_name = av_strtok(print_format, "=", &buf);
w_args = buf;


w = writer_get_by_name(w_str);
w = writer_get_by_name(w_name);
if (!w) { if (!w) {
av_log(NULL, AV_LOG_ERROR, "Invalid output format '%s'\n", w_str);
av_log(NULL, AV_LOG_ERROR, "Unknown output format with name '%s'\n", w_name);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;
} }
@@ -848,8 +842,7 @@ static int probe_file(const char *filename)
writer_close(&wctx); writer_close(&wctx);


end: end:
av_free(w_str);
av_free(w_args);
av_free(print_format);


return ret; return ret;
} }


Loading…
Cancel
Save