Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
9ee59b63
Commit
9ee59b63
authored
Jan 20, 2024
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: remove deprecated FF_API_AYUV_CODECID
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
c9477312
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
81 deletions
+8
-81
allcodecs.c
libavcodec/allcodecs.c
+0
-4
codec_desc.c
libavcodec/codec_desc.c
+0
-9
codec_id.h
libavcodec/codec_id.h
+0
-3
v408dec.c
libavcodec/v408dec.c
+4
-31
v408enc.c
libavcodec/v408enc.c
+4
-33
version_major.h
libavcodec/version_major.h
+0
-1
No files found.
libavcodec/allcodecs.c
View file @
9ee59b63
...
...
@@ -61,10 +61,6 @@ extern const FFCodec ff_avrn_decoder;
extern
const
FFCodec
ff_avs_decoder
;
extern
const
FFCodec
ff_avui_encoder
;
extern
const
FFCodec
ff_avui_decoder
;
#if FF_API_AYUV_CODECID
extern
const
FFCodec
ff_ayuv_encoder
;
extern
const
FFCodec
ff_ayuv_decoder
;
#endif
extern
const
FFCodec
ff_bethsoftvid_decoder
;
extern
const
FFCodec
ff_bfi_decoder
;
extern
const
FFCodec
ff_bink_decoder
;
...
...
libavcodec/codec_desc.c
View file @
9ee59b63
...
...
@@ -1470,15 +1470,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Avid Meridien Uncompressed"
),
.
props
=
AV_CODEC_PROP_INTRA_ONLY
|
AV_CODEC_PROP_LOSSLESS
,
},
#if FF_API_AYUV_CODECID
{
.
id
=
AV_CODEC_ID_AYUV
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"ayuv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Uncompressed packed MS 4:4:4:4"
),
.
props
=
AV_CODEC_PROP_INTRA_ONLY
|
AV_CODEC_PROP_LOSSLESS
,
},
#endif
{
.
id
=
AV_CODEC_ID_TARGA_Y216
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
...
...
libavcodec/codec_id.h
View file @
9ee59b63
...
...
@@ -253,9 +253,6 @@ enum AVCodecID {
AV_CODEC_ID_AVRP
,
AV_CODEC_ID_012V
,
AV_CODEC_ID_AVUI
,
#if FF_API_AYUV_CODECID
AV_CODEC_ID_AYUV
,
#endif
AV_CODEC_ID_TARGA_Y216
,
AV_CODEC_ID_V308
,
AV_CODEC_ID_V408
,
...
...
libavcodec/v408dec.c
View file @
9ee59b63
...
...
@@ -29,10 +29,6 @@ static av_cold int v408_decode_init(AVCodecContext *avctx)
{
avctx
->
pix_fmt
=
AV_PIX_FMT_YUVA444P
;
#if FF_API_AYUV_CODECID
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AYUV
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"This decoder is deprecated and will be removed.
\n
"
);
#endif
return
0
;
}
...
...
@@ -61,20 +57,10 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic,
for
(
i
=
0
;
i
<
avctx
->
height
;
i
++
)
{
for
(
j
=
0
;
j
<
avctx
->
width
;
j
++
)
{
#if FF_API_AYUV_CODECID
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AYUV
)
{
v
[
j
]
=
*
src
++
;
u
[
j
]
=
*
src
++
;
y
[
j
]
=
*
src
++
;
a
[
j
]
=
*
src
++
;
}
else
#endif
{
u
[
j
]
=
*
src
++
;
y
[
j
]
=
*
src
++
;
v
[
j
]
=
*
src
++
;
a
[
j
]
=
*
src
++
;
}
u
[
j
]
=
*
src
++
;
y
[
j
]
=
*
src
++
;
v
[
j
]
=
*
src
++
;
a
[
j
]
=
*
src
++
;
}
y
+=
pic
->
linesize
[
0
];
...
...
@@ -88,19 +74,6 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic,
return
avpkt
->
size
;
}
#if FF_API_AYUV_CODECID
#if CONFIG_AYUV_DECODER
const
FFCodec
ff_ayuv_decoder
=
{
.
p
.
name
=
"ayuv"
,
CODEC_LONG_NAME
(
"Uncompressed packed MS 4:4:4:4"
),
.
p
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
p
.
id
=
AV_CODEC_ID_AYUV
,
.
init
=
v408_decode_init
,
FF_CODEC_DECODE_CB
(
v408_decode_frame
),
.
p
.
capabilities
=
AV_CODEC_CAP_DR1
,
};
#endif
#endif
#if CONFIG_V408_DECODER
const
FFCodec
ff_v408_decoder
=
{
.
p
.
name
=
"v408"
,
...
...
libavcodec/v408enc.c
View file @
9ee59b63
...
...
@@ -33,11 +33,6 @@ static av_cold int v408_encode_init(AVCodecContext *avctx)
avctx
->
bits_per_coded_sample
=
32
;
avctx
->
bit_rate
=
ff_guess_coded_bitrate
(
avctx
);
#if FF_API_AYUV_CODECID
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AYUV
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"This encoder is deprecated and will be removed.
\n
"
);
#endif
return
0
;
}
...
...
@@ -60,20 +55,10 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
for
(
i
=
0
;
i
<
avctx
->
height
;
i
++
)
{
for
(
j
=
0
;
j
<
avctx
->
width
;
j
++
)
{
#if FF_API_AYUV_CODECID
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AYUV
)
{
*
dst
++
=
v
[
j
];
*
dst
++
=
u
[
j
];
*
dst
++
=
y
[
j
];
*
dst
++
=
a
[
j
];
}
else
#endif
{
*
dst
++
=
u
[
j
];
*
dst
++
=
y
[
j
];
*
dst
++
=
v
[
j
];
*
dst
++
=
a
[
j
];
}
*
dst
++
=
u
[
j
];
*
dst
++
=
y
[
j
];
*
dst
++
=
v
[
j
];
*
dst
++
=
a
[
j
];
}
y
+=
pic
->
linesize
[
0
];
u
+=
pic
->
linesize
[
1
];
...
...
@@ -87,20 +72,6 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
static
const
enum
AVPixelFormat
pix_fmt
[]
=
{
AV_PIX_FMT_YUVA444P
,
AV_PIX_FMT_NONE
};
#if FF_API_AYUV_CODECID
#if CONFIG_AYUV_ENCODER
const
FFCodec
ff_ayuv_encoder
=
{
.
p
.
name
=
"ayuv"
,
CODEC_LONG_NAME
(
"Uncompressed packed MS 4:4:4:4"
),
.
p
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
p
.
id
=
AV_CODEC_ID_AYUV
,
.
p
.
capabilities
=
AV_CODEC_CAP_DR1
|
AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
,
.
init
=
v408_encode_init
,
FF_CODEC_ENCODE_CB
(
v408_encode_frame
),
.
p
.
pix_fmts
=
pix_fmt
,
};
#endif
#endif
#if CONFIG_V408_ENCODER
const
FFCodec
ff_v408_encoder
=
{
.
p
.
name
=
"v408"
,
...
...
libavcodec/version_major.h
View file @
9ee59b63
...
...
@@ -38,7 +38,6 @@
*/
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61)
#define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 61)
#define FF_API_VT_OUTPUT_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 61)
#define FF_API_AVCODEC_CHROMA_POS (LIBAVCODEC_VERSION_MAJOR < 61)
#define FF_API_VT_HWACCEL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 61)
...
...
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