diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:00:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:01:39 +0200 |
commit | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (patch) | |
tree | 519a70950e58fd451aad4bffb53b987a2482068a /ffmpeg_filter.c | |
parent | d6c342fdc0b434b514f99e1feaa108ab17bba806 (diff) | |
parent | bc4620e5d61a4dd9a1f654fadd281a172aab04be (diff) | |
download | ffmpeg-b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2.tar.gz |
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
Remove libmpeg2 #define remnants
De-doxygenize some top-level files
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
-rw-r--r-- | ffmpeg_filter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index eb09b778b6..436cdf27d2 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -129,10 +129,8 @@ static char *choose_pix_fmts(OutputStream *ost) return NULL; } -/** - * Define a function for building a string containing a list of - * allowed formats, - */ +/* 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)\ static char *choose_ ## var ## s(OutputStream *ost) \ { \ |