| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 13:19:32 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 13:19:32 (GMT) |
| commit | 7b6c0bda9e94a9214445f83a4a469110b235dbde (patch) | |
| tree | 4fd265135b63d1eb69922e955ee5719a9c1c7d1e | |
| parent | 9a91c67478cd46d8c43774f8e1876d90323432d3 (diff) | |
| parent | bee2d75b66e2f02e0877796c01202299a4b56cfb (diff) | |
| download | ffmpeg-7b6c0bda9e94a9214445f83a4a469110b235dbde.zip ffmpeg-7b6c0bda9e94a9214445f83a4a469110b235dbde.tar.gz ffmpeg-7b6c0bda9e94a9214445f83a4a469110b235dbde.tar.bz2 | |
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
avconv: update to the new options syntax.
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_filter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 63d8c54..1b696b7 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -134,7 +134,7 @@ static char *choose_pix_fmts(OutputStream *ost) /* 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) { \ @@ -151,7 +151,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; \ @@ -161,16 +161,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) { |