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
955ab9a4
Commit
955ab9a4
authored
18 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
attribute_deprecated
Originally committed as revision 6033 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
ed567d9c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/avformat.h
+11
-11
11 additions, 11 deletions
libavformat/avformat.h
libavutil/common.h
+8
-0
8 additions, 0 deletions
libavutil/common.h
with
19 additions
and
11 deletions
libavformat/avformat.h
+
11
−
11
View file @
955ab9a4
...
@@ -79,7 +79,7 @@ static inline void av_free_packet(AVPacket *pkt)
...
@@ -79,7 +79,7 @@ static inline void av_free_packet(AVPacket *pkt)
is assumed to be such as 0 <= num < den */
is assumed to be such as 0 <= num < den */
typedef
struct
AVFrac
{
typedef
struct
AVFrac
{
int64_t
val
,
num
,
den
;
int64_t
val
,
num
,
den
;
}
AVFrac
;
}
AVFrac
attribute_deprecated
;
/*************************************************/
/*************************************************/
/* input/output formats */
/* input/output formats */
...
@@ -351,8 +351,8 @@ extern AVInputFormat *first_iformat;
...
@@ -351,8 +351,8 @@ extern AVInputFormat *first_iformat;
extern
AVOutputFormat
*
first_oformat
;
extern
AVOutputFormat
*
first_oformat
;
/* still image support */
/* still image support */
struct
AVInputImageContext
;
struct
AVInputImageContext
attribute_deprecated
;
typedef
struct
AVInputImageContext
AVInputImageContext
;
typedef
struct
AVInputImageContext
AVInputImageContext
attribute_deprecated
;
typedef
struct
AVImageInfo
{
typedef
struct
AVImageInfo
{
enum
PixelFormat
pix_fmt
;
/* requested pixel format */
enum
PixelFormat
pix_fmt
;
/* requested pixel format */
...
@@ -360,7 +360,7 @@ typedef struct AVImageInfo {
...
@@ -360,7 +360,7 @@ typedef struct AVImageInfo {
int
height
;
/* requested height */
int
height
;
/* requested height */
int
interleaved
;
/* image is interleaved (e.g. interleaved GIF) */
int
interleaved
;
/* image is interleaved (e.g. interleaved GIF) */
AVPicture
pict
;
/* returned allocated image */
AVPicture
pict
;
/* returned allocated image */
}
AVImageInfo
;
}
AVImageInfo
attribute_deprecated
;
/* AVImageFormat.flags field constants */
/* AVImageFormat.flags field constants */
#define AVIMAGE_INTERLEAVED 0x0001
/* image format support interleaved output */
#define AVIMAGE_INTERLEAVED 0x0001
/* image format support interleaved output */
...
@@ -381,18 +381,18 @@ typedef struct AVImageFormat {
...
@@ -381,18 +381,18 @@ typedef struct AVImageFormat {
int
(
*
img_write
)(
ByteIOContext
*
,
AVImageInfo
*
);
int
(
*
img_write
)(
ByteIOContext
*
,
AVImageInfo
*
);
int
flags
;
int
flags
;
struct
AVImageFormat
*
next
;
struct
AVImageFormat
*
next
;
}
AVImageFormat
;
}
AVImageFormat
attribute_deprecated
;
void
av_register_image_format
(
AVImageFormat
*
img_fmt
);
void
av_register_image_format
(
AVImageFormat
*
img_fmt
)
attribute_deprecated
;
AVImageFormat
*
av_probe_image_format
(
AVProbeData
*
pd
);
AVImageFormat
*
av_probe_image_format
(
AVProbeData
*
pd
)
attribute_deprecated
;
AVImageFormat
*
guess_image_format
(
const
char
*
filename
);
AVImageFormat
*
guess_image_format
(
const
char
*
filename
)
attribute_deprecated
;
enum
CodecID
av_guess_image2_codec
(
const
char
*
filename
);
enum
CodecID
av_guess_image2_codec
(
const
char
*
filename
);
int
av_read_image
(
ByteIOContext
*
pb
,
const
char
*
filename
,
int
av_read_image
(
ByteIOContext
*
pb
,
const
char
*
filename
,
AVImageFormat
*
fmt
,
AVImageFormat
*
fmt
,
int
(
*
alloc_cb
)(
void
*
,
AVImageInfo
*
info
),
void
*
opaque
);
int
(
*
alloc_cb
)(
void
*
,
AVImageInfo
*
info
),
void
*
opaque
)
attribute_deprecated
;
int
av_write_image
(
ByteIOContext
*
pb
,
AVImageFormat
*
fmt
,
AVImageInfo
*
img
);
int
av_write_image
(
ByteIOContext
*
pb
,
AVImageFormat
*
fmt
,
AVImageInfo
*
img
)
attribute_deprecated
;
extern
AVImageFormat
*
first_image_format
;
extern
AVImageFormat
*
first_image_format
attribute_deprecated
;
/* XXX: use automatic init with either ELF sections or C file parser */
/* XXX: use automatic init with either ELF sections or C file parser */
/* modules */
/* modules */
...
...
This diff is collapsed.
Click to expand it.
libavutil/common.h
+
8
−
0
View file @
955ab9a4
...
@@ -56,6 +56,14 @@
...
@@ -56,6 +56,14 @@
#endif
#endif
#endif
#endif
#ifndef attribute_deprecated
#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
# define attribute_deprecated __attribute__((deprecated))
#else
# define attribute_deprecated
#endif
#endif
#ifndef EMULATE_INTTYPES
#ifndef EMULATE_INTTYPES
# include <inttypes.h>
# include <inttypes.h>
#else
#else
...
...
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