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 /ffserver.c | |
| parent | db9cc3a55a130349667f78f3ad337285c831312b (diff) | |
| download | ffmpeg-126b638ea0c7838fde13850a0ad833170a269253.tar.gz | |
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 'ffserver.c')
| -rw-r--r-- | ffserver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index 8f073fe365..d5d841768d 100644 --- a/ffserver.c +++ b/ffserver.c @@ -36,6 +36,7 @@ #include "libavutil/avstring.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" +#include "libavcore/parseutils.h" #include "libavcodec/opt.h" #include <stdarg.h> #include <unistd.h> @@ -4410,7 +4411,7 @@ static int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "VideoSize")) { get_arg(arg, sizeof(arg), &p); if (stream) { - av_parse_video_frame_size(&video_enc.width, &video_enc.height, arg); + av_parse_video_size(&video_enc.width, &video_enc.height, arg); if ((video_enc.width % 16) != 0 || (video_enc.height % 16) != 0) { ERROR("Image size must be a multiple of 16\n"); @@ -4420,7 +4421,7 @@ static int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); if (stream) { AVRational frame_rate; - if (av_parse_video_frame_rate(&frame_rate, arg) < 0) { + if (av_parse_video_rate(&frame_rate, arg) < 0) { ERROR("Incorrect frame rate: %s\n", arg); } else { video_enc.time_base.num = frame_rate.den; |