RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi: allow building without swscale.

This commit is contained in:
Anton Khirnov 2012-06-13 10:10:31 +02:00
parent a488028362
commit 2f296e39a1
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1531,16 +1531,16 @@ frei0r_src_filter_extralibs='$ldl'
hqdn3d_filter_deps="gpl" hqdn3d_filter_deps="gpl"
resample_filter_deps="avresample" resample_filter_deps="avresample"
ocv_filter_deps="libopencv" ocv_filter_deps="libopencv"
scale_filter_deps="swscale"
yadif_filter_deps="gpl" yadif_filter_deps="gpl"
# libraries # libraries
avdevice_deps="avcodec avformat" avdevice_deps="avcodec avformat"
avfilter_deps="swscale"
avformat_deps="avcodec" avformat_deps="avcodec"
# programs # programs
avconv_deps="avcodec avfilter avformat avresample swscale format_filter avconv_deps="avcodec avfilter avformat avresample swscale format_filter
setpts_filter" scale_filter setpts_filter"
avplay_deps="avcodec avformat swscale sdl" avplay_deps="avcodec avformat swscale sdl"
avplay_select="rdft" avplay_select="rdft"
avprobe_deps="avcodec avformat" avprobe_deps="avcodec avformat"

4
libavfilter/Makefile
View File

@ -1,8 +1,9 @@
NAME = avfilter NAME = avfilter
FFLIBS = avutil swscale FFLIBS = avutil
FFLIBS-$(CONFIG_ASYNCTS_FILTER) += avresample FFLIBS-$(CONFIG_ASYNCTS_FILTER) += avresample
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample
FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
HEADERS = avfilter.h \ HEADERS = avfilter.h \
avfiltergraph.h \ avfiltergraph.h \
@ -63,6 +64,7 @@ OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o
OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
OBJS-$(CONFIG_SELECT_FILTER) += vf_select.o OBJS-$(CONFIG_SELECT_FILTER) += vf_select.o
OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o

5
libavfilter/allfilters.c
View File

@ -73,6 +73,7 @@ void avfilter_register_all(void)
REGISTER_FILTER (OVERLAY, overlay, vf); REGISTER_FILTER (OVERLAY, overlay, vf);
REGISTER_FILTER (PAD, pad, vf); REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf); REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
REGISTER_FILTER (SCALE, scale, vf);
REGISTER_FILTER (SELECT, select, vf); REGISTER_FILTER (SELECT, select, vf);
REGISTER_FILTER (SETDAR, setdar, vf); REGISTER_FILTER (SETDAR, setdar, vf);
REGISTER_FILTER (SETPTS, setpts, vf); REGISTER_FILTER (SETPTS, setpts, vf);
@ -113,8 +114,4 @@ void avfilter_register_all(void)
extern AVFilter avfilter_asink_abuffer; extern AVFilter avfilter_asink_abuffer;
avfilter_register(&avfilter_asink_abuffer); avfilter_register(&avfilter_asink_abuffer);
} }
{
extern AVFilter avfilter_vf_scale;
avfilter_register(&avfilter_vf_scale);
}
} }

9
libavfilter/avfiltergraph.c
View File

@ -213,11 +213,16 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
/* couldn't merge format lists. auto-insert conversion filter */ /* couldn't merge format lists. auto-insert conversion filter */
switch (link->type) { switch (link->type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (!(filter = avfilter_get_by_name("scale"))) {
av_log(log_ctx, AV_LOG_ERROR, "'scale' filter "
"not present, cannot convert pixel formats.\n");
return AVERROR(EINVAL);
}
snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d", snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
scaler_count++); scaler_count++);
snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts); snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
if ((ret = avfilter_graph_create_filter(&convert, if ((ret = avfilter_graph_create_filter(&convert, filter,
avfilter_get_by_name("scale"),
inst_name, scale_args, NULL, inst_name, scale_args, NULL,
graph)) < 0) graph)) < 0)
return ret; return ret;