diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-26 23:12:28 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-26 23:12:28 +0000 |
| commit | 126b638ea0c7838fde13850a0ad833170a269253 (patch) | |
| tree | 7b47bf6060b6b8d8a45d23c49ca3aede2945132e /libavfilter | |
| parent | db9cc3a55a130349667f78f3ad337285c831312b (diff) | |
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.
This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.
Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/vf_pad.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c2c1a2124d..33cd2ab6f5 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -1,7 +1,7 @@ include $(SUBDIR)../config.mak NAME = avfilter -FFLIBS = avcodec avutil swscale +FFLIBS = avcodec avcore avutil swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat HEADERS = avfilter.h diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 8224c7d776..bfa2dd532a 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -28,7 +28,7 @@ #include "parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/colorspace.h" -#include "libavcodec/avcodec.h" +#include "libavcore/parseutils.h" enum { RED = 0, GREEN, BLUE, ALPHA }; @@ -363,12 +363,12 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaq if (args) sscanf(args, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate); - if (av_parse_video_frame_size(&color->w, &color->h, frame_size) < 0) { + if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) { av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size); return AVERROR(EINVAL); } - if (av_parse_video_frame_rate(&frame_rate_q, frame_rate) < 0 || + if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 || frame_rate_q.den <= 0 || frame_rate_q.num <= 0) { av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate); return AVERROR(EINVAL); |