Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavf: remove FF_API_PARSE_FRAME_PARAM cruft

Browse source
This commit is contained in:
Anton Khirnov 2011-02-03 12:44:04 +01:00
parent 4df001d77f
commit 58d5ff0abf
3 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libavformat/avformat.h
View file

@ -1409,22 +1409,6 @@ void av_dump_format(AVFormatContext *ic,
const char *url, const char *url,
int is_output); 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 #if FF_API_PARSE_DATE
/** /**
* Parse datestr and return a corresponding number of microseconds. * Parse datestr and return a corresponding number of microseconds.

18
libavformat/utils.c
View file

@ -3320,24 +3320,6 @@ void av_dump_format(AVFormatContext *ic,
av_free(printed); 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) int64_t av_gettime(void)
{ {
struct timeval tv; struct timeval tv;

3
libavformat/version.h
View file

@ -47,9 +47,6 @@
#ifndef FF_API_URL_CLASS #ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif #endif
#ifndef FF_API_PARSE_FRAME_PARAM
#define FF_API_PARSE_FRAME_PARAM (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_READ_SEEK #ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif