Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -57,7 +57,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct LutContext {
|
||||
const AVClass *class;
|
||||
uint8_t lut[4][256]; ///< lookup table for each component
|
||||
char *comp_expr_str[4];
|
||||
|
||||
Reference in New Issue
Block a user