diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:44:04 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:39 +0200 |
| commit | 58d5ff0abf657fe0ec3564433ebbde9fc8f71ffd (patch) | |
| tree | c00017b3d5431a47a9c7b66271b8305aead7a985 /libavformat | |
| parent | 4df001d77f8f39d2914b21f14ca2236b0ffd6a48 (diff) | |
| download | ffmpeg-58d5ff0abf657fe0ec3564433ebbde9fc8f71ffd.tar.gz | |
lavf: remove FF_API_PARSE_FRAME_PARAM cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 16 | ||||
| -rw-r--r-- | libavformat/utils.c | 18 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 37 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3e47285267..289834627a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1409,22 +1409,6 @@ void av_dump_format(AVFormatContext *ic, const char *url, int is_output); -#if FF_API_PARSE_FRAME_PARAM -/** - * Parse width and height out of string str. - * @deprecated Use av_parse_video_frame_size instead. - */ -attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr, - const char *str); - -/** - * Convert framerate from a string to a fraction. - * @deprecated Use av_parse_video_frame_rate instead. - */ -attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base, - const char *arg); -#endif - #if FF_API_PARSE_DATE /** * Parse datestr and return a corresponding number of microseconds. diff --git a/libavformat/utils.c b/libavformat/utils.c index 91e0ddca2d..d2f70e17e6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3320,24 +3320,6 @@ void av_dump_format(AVFormatContext *ic, av_free(printed); } -#if FF_API_PARSE_FRAME_PARAM -#include "libavutil/parseutils.h" - -int parse_image_size(int *width_ptr, int *height_ptr, const char *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_rate(&frame_rate, arg); - *frame_rate_num= frame_rate.num; - *frame_rate_den= frame_rate.den; - return ret; -} -#endif - int64_t av_gettime(void) { struct timeval tv; diff --git a/libavformat/version.h b/libavformat/version.h index f87665c205..08dc566425 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_URL_CLASS #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #endif -#ifndef FF_API_PARSE_FRAME_PARAM -#define FF_API_PARSE_FRAME_PARAM (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_READ_SEEK #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |