Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
9e5c62c9
Commit
9e5c62c9
authored
14 years ago
by
Anton Khirnov
Browse files
Options
Downloads
Patches
Plain Diff
lavu: remove FF_API_OLD_IMAGE_NAMES cruft
parent
516fb5e4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavutil/avutil.h
+0
-8
0 additions, 8 deletions
libavutil/avutil.h
libavutil/imgutils.c
+0
-29
0 additions, 29 deletions
libavutil/imgutils.c
libavutil/imgutils.h
+0
-19
0 additions, 19 deletions
libavutil/imgutils.h
with
0 additions
and
56 deletions
libavutil/avutil.h
+
0
−
8
View file @
9e5c62c9
...
@@ -94,14 +94,6 @@ enum AVMediaType {
...
@@ -94,14 +94,6 @@ enum AVMediaType {
#define AV_TIME_BASE 1000000
#define AV_TIME_BASE 1000000
#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
/**
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
#ifndef FF_API_OLD_IMAGE_NAMES
#define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51)
#endif
#include
"common.h"
#include
"common.h"
#include
"error.h"
#include
"error.h"
#include
"mathematics.h"
#include
"mathematics.h"
...
...
This diff is collapsed.
Click to expand it.
libavutil/imgutils.c
+
0
−
29
View file @
9e5c62c9
...
@@ -266,32 +266,3 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
...
@@ -266,32 +266,3 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
}
}
}
}
}
}
#if FF_API_OLD_IMAGE_NAMES
void
av_fill_image_max_pixsteps
(
int
max_pixsteps
[
4
],
int
max_pixstep_comps
[
4
],
const
AVPixFmtDescriptor
*
pixdesc
)
{
av_image_fill_max_pixsteps
(
max_pixsteps
,
max_pixstep_comps
,
pixdesc
);
}
int
av_get_image_linesize
(
enum
PixelFormat
pix_fmt
,
int
width
,
int
plane
)
{
return
av_image_get_linesize
(
pix_fmt
,
width
,
plane
);
}
int
av_fill_image_linesizes
(
int
linesizes
[
4
],
enum
PixelFormat
pix_fmt
,
int
width
)
{
return
av_image_fill_linesizes
(
linesizes
,
pix_fmt
,
width
);
}
int
av_fill_image_pointers
(
uint8_t
*
data
[
4
],
enum
PixelFormat
pix_fmt
,
int
height
,
uint8_t
*
ptr
,
const
int
linesizes
[
4
])
{
return
av_image_fill_pointers
(
data
,
pix_fmt
,
height
,
ptr
,
linesizes
);
}
int
av_check_image_size
(
unsigned
int
w
,
unsigned
int
h
,
int
log_offset
,
void
*
log_ctx
)
{
return
av_image_check_size
(
w
,
h
,
log_offset
,
log_ctx
);
}
#endif
This diff is collapsed.
Click to expand it.
libavutil/imgutils.h
+
0
−
19
View file @
9e5c62c9
...
@@ -127,23 +127,4 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo
...
@@ -127,23 +127,4 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo
int
ff_set_systematic_pal2
(
uint32_t
pal
[
256
],
enum
PixelFormat
pix_fmt
);
int
ff_set_systematic_pal2
(
uint32_t
pal
[
256
],
enum
PixelFormat
pix_fmt
);
#if FF_API_OLD_IMAGE_NAMES
attribute_deprecated
void
av_fill_image_max_pixsteps
(
int
max_pixsteps
[
4
],
int
max_pixstep_comps
[
4
],
const
AVPixFmtDescriptor
*
pixdesc
);
attribute_deprecated
int
av_get_image_linesize
(
enum
PixelFormat
pix_fmt
,
int
width
,
int
plane
);
attribute_deprecated
int
av_fill_image_linesizes
(
int
linesizes
[
4
],
enum
PixelFormat
pix_fmt
,
int
width
);
attribute_deprecated
int
av_fill_image_pointers
(
uint8_t
*
data
[
4
],
enum
PixelFormat
pix_fmt
,
int
height
,
uint8_t
*
ptr
,
const
int
linesizes
[
4
]);
attribute_deprecated
int
av_check_image_size
(
unsigned
int
w
,
unsigned
int
h
,
int
log_offset
,
void
*
log_ctx
);
#endif
#endif
/* AVUTIL_IMGUTILS_H */
#endif
/* AVUTIL_IMGUTILS_H */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment