avfilter/vf_removegrain: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
		
							parent
							
								
									7c275aefe2
								
							
						
					
					
						commit
						db68f0e60b
					
				@ -44,8 +44,6 @@ static const AVOption removegrain_options[] = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
AVFILTER_DEFINE_CLASS(removegrain);
 | 
					AVFILTER_DEFINE_CLASS(removegrain);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int query_formats(AVFilterContext *ctx)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    static const enum AVPixelFormat pix_fmts[] = {
 | 
					    static const enum AVPixelFormat pix_fmts[] = {
 | 
				
			||||||
        AV_PIX_FMT_GRAY8,
 | 
					        AV_PIX_FMT_GRAY8,
 | 
				
			||||||
        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
 | 
					        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
 | 
				
			||||||
@ -57,9 +55,6 @@ static int query_formats(AVFilterContext *ctx)
 | 
				
			|||||||
        AV_PIX_FMT_NONE
 | 
					        AV_PIX_FMT_NONE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return ff_set_common_formats_from_list(ctx, pix_fmts);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define REMOVE_GRAIN_SORT_AXIS       \
 | 
					#define REMOVE_GRAIN_SORT_AXIS       \
 | 
				
			||||||
    const int ma1 = FFMAX(a1, a8);   \
 | 
					    const int ma1 = FFMAX(a1, a8);   \
 | 
				
			||||||
    const int mi1 = FFMIN(a1, a8);   \
 | 
					    const int mi1 = FFMIN(a1, a8);   \
 | 
				
			||||||
@ -649,7 +644,7 @@ const AVFilter ff_vf_removegrain = {
 | 
				
			|||||||
    .priv_size     = sizeof(RemoveGrainContext),
 | 
					    .priv_size     = sizeof(RemoveGrainContext),
 | 
				
			||||||
    FILTER_INPUTS(removegrain_inputs),
 | 
					    FILTER_INPUTS(removegrain_inputs),
 | 
				
			||||||
    FILTER_OUTPUTS(removegrain_outputs),
 | 
					    FILTER_OUTPUTS(removegrain_outputs),
 | 
				
			||||||
    FILTER_QUERY_FUNC(query_formats),
 | 
					    FILTER_PIXFMTS_ARRAY(pix_fmts),
 | 
				
			||||||
    .priv_class    = &removegrain_class,
 | 
					    .priv_class    = &removegrain_class,
 | 
				
			||||||
    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
 | 
					    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user