avfilter/vf_unsharp: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
		
							parent
							
								
									2635e851de
								
							
						
					
					
						commit
						6330e914f1
					
				@ -197,8 +197,6 @@ static av_cold int init(AVFilterContext *ctx)
 | 
				
			|||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int query_formats(AVFilterContext *ctx)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    static const enum AVPixelFormat pix_fmts[] = {
 | 
					    static const enum AVPixelFormat pix_fmts[] = {
 | 
				
			||||||
        AV_PIX_FMT_YUV420P,  AV_PIX_FMT_YUV422P,  AV_PIX_FMT_YUV444P,  AV_PIX_FMT_YUV410P,
 | 
					        AV_PIX_FMT_YUV420P,  AV_PIX_FMT_YUV422P,  AV_PIX_FMT_YUV444P,  AV_PIX_FMT_YUV410P,
 | 
				
			||||||
        AV_PIX_FMT_YUV411P,  AV_PIX_FMT_YUV440P,  AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
 | 
					        AV_PIX_FMT_YUV411P,  AV_PIX_FMT_YUV440P,  AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
 | 
				
			||||||
@ -209,9 +207,6 @@ static int query_formats(AVFilterContext *ctx)
 | 
				
			|||||||
        AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE
 | 
					        AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return ff_set_common_formats_from_list(ctx, pix_fmts);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width)
 | 
					static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    int z;
 | 
					    int z;
 | 
				
			||||||
@ -361,6 +356,6 @@ const AVFilter ff_vf_unsharp = {
 | 
				
			|||||||
    .uninit        = uninit,
 | 
					    .uninit        = uninit,
 | 
				
			||||||
    FILTER_INPUTS(avfilter_vf_unsharp_inputs),
 | 
					    FILTER_INPUTS(avfilter_vf_unsharp_inputs),
 | 
				
			||||||
    FILTER_OUTPUTS(avfilter_vf_unsharp_outputs),
 | 
					    FILTER_OUTPUTS(avfilter_vf_unsharp_outputs),
 | 
				
			||||||
    FILTER_QUERY_FUNC(query_formats),
 | 
					    FILTER_PIXFMTS_ARRAY(pix_fmts),
 | 
				
			||||||
    .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