summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-26 23:12:28 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-26 23:12:28 +0000
commit126b638ea0c7838fde13850a0ad833170a269253 (patch)
tree7b47bf6060b6b8d8a45d23c49ca3aede2945132e /libavformat
parentdb9cc3a55a130349667f78f3ad337285c831312b (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 'libavformat')
-rw-r--r--libavformat/utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6fa4dff419..1aa965c59b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3182,15 +3182,17 @@ void dump_format(AVFormatContext *ic,
}
#if LIBAVFORMAT_VERSION_MAJOR < 53
+#include "libavcore/parseutils.h"
+
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{
- return av_parse_video_frame_size(width_ptr, height_ptr, str);
+ return av_parse_video_size(width_ptr, height_ptr, str);
}
int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
{
AVRational frame_rate;
- int ret = av_parse_video_frame_rate(&frame_rate, arg);
+ int ret = av_parse_video_rate(&frame_rate, arg);
*frame_rate_num= frame_rate.num;
*frame_rate_den= frame_rate.den;
return ret;