Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
58d5ff0a
Commit
58d5ff0a
authored
Feb 03, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove FF_API_PARSE_FRAME_PARAM cruft
parent
4df001d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
37 deletions
+0
-37
libavformat/avformat.h
libavformat/avformat.h
+0
-16
libavformat/utils.c
libavformat/utils.c
+0
-18
libavformat/version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avformat.h
View file @
58d5ff0a
...
...
@@ -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.
...
...
libavformat/utils.c
View file @
58d5ff0a
...
...
@@ -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
;
...
...
libavformat/version.h
View file @
58d5ff0a
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment