diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-12 19:31:08 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-11 20:44:45 +0200 |
| commit | bee2d75b66e2f02e0877796c01202299a4b56cfb (patch) | |
| tree | ab218e2bf2ced9f2fcc8d9abef0a1d7ff7aaa3af | |
| parent | f160c6a18a574b4c7d063e0a748037cbbd9912ee (diff) | |
| download | ffmpeg-bee2d75b66e2f02e0877796c01202299a4b56cfb.tar.gz | |
avconv: update to the new options syntax.
The separators were changed from ',' to '|' in all the filters.
| -rw-r--r-- | avconv_filter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/avconv_filter.c b/avconv_filter.c index dd0f35b907..7edcbf6e23 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -34,7 +34,7 @@ /* Define a function for building a string containing a list of * allowed formats. */ -#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator)\ +#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name) \ static char *choose_ ## var ## s(OutputStream *ost) \ { \ if (ost->st->codec->var != none) { \ @@ -51,7 +51,7 @@ static char *choose_ ## var ## s(OutputStream *ost) \ \ for (p = ost->enc->supported_list; *p != none; p++) { \ get_name(*p); \ - avio_printf(s, "%s" separator, name); \ + avio_printf(s, "%s|", name); \ } \ len = avio_close_dyn_buf(s, &ret); \ ret[len - 1] = 0; \ @@ -61,16 +61,16 @@ static char *choose_ ## var ## s(OutputStream *ost) \ } DEF_CHOOSE_FORMAT(enum AVPixelFormat, pix_fmt, pix_fmts, AV_PIX_FMT_NONE, - GET_PIX_FMT_NAME, ":") + GET_PIX_FMT_NAME) DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, - AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") + AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME) DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, - GET_SAMPLE_RATE_NAME, ",") + GET_SAMPLE_RATE_NAME) DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, - GET_CH_LAYOUT_NAME, ",") + GET_CH_LAYOUT_NAME) FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) { |