mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-20 16:25:04 +02:00
Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51'
* commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51': lavu: Drop deprecated external access to AVPixFmtDescriptor table Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
0eed703d64
@ -127,10 +127,7 @@ void av_write_image_line(const uint16_t *src,
|
||||
}
|
||||
}
|
||||
|
||||
#if !FF_API_PIX_FMT_DESC
|
||||
static
|
||||
#endif
|
||||
const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
|
||||
static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
|
||||
[AV_PIX_FMT_YUV420P] = {
|
||||
.name = "yuv420p",
|
||||
.nb_components = 3,
|
||||
|
@ -155,13 +155,6 @@ typedef struct AVPixFmtDescriptor {
|
||||
*/
|
||||
#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
|
||||
|
||||
#if FF_API_PIX_FMT_DESC
|
||||
/**
|
||||
* The array of all the pixel format descriptors.
|
||||
*/
|
||||
extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Read a line from an image, and write the values of the
|
||||
* pixel format component c to dst.
|
||||
|
@ -90,9 +90,6 @@
|
||||
#ifndef FF_API_CONTEXT_SIZE
|
||||
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_PIX_FMT_DESC
|
||||
#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_AV_REVERSE
|
||||
#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user