diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 19:03:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 19:06:50 +0400 |
| commit | aee51039ee204197fdb4c924f8ee433b803ab1e1 (patch) | |
| tree | b1138f704eec5bf82e6fcc23591c7b245f728ac5 /ffmpeg_filter.c | |
| parent | 67a6dac7c18caecb418f7590a484dcbfcad869ab (diff) | |
| parent | f8b1e665539010d3ca148f09cb1203c20c1ca174 (diff) | |
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
avconv: print info/capabilities options in a separate help group.
avtools: add -h demuxer/muxer
cmdutils: extend -h to allow printing codec details.
Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 498803c30a..5dcfaa4601 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -159,29 +159,15 @@ static char *choose_ ## var ## s(OutputStream *ost) \ return NULL; \ } -#define GET_PIX_FMT_NAME(pix_fmt)\ - const char *name = av_get_pix_fmt_name(pix_fmt); - // DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE, // GET_PIX_FMT_NAME, ":") -#define GET_SAMPLE_FMT_NAME(sample_fmt)\ - const char *name = av_get_sample_fmt_name(sample_fmt) - DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") -#define GET_SAMPLE_RATE_NAME(rate)\ - char name[16];\ - snprintf(name, sizeof(name), "%d", rate); - DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, GET_SAMPLE_RATE_NAME, ",") -#define GET_CH_LAYOUT_NAME(ch_layout)\ - char name[16];\ - snprintf(name, sizeof(name), "0x%"PRIx64, ch_layout); - DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, GET_CH_LAYOUT_NAME, ",") |