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
5b23b18d
Commit
5b23b18d
authored
Jan 20, 2024
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: remove deprecated FF_CODEC_CRYSTAL_HD
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
98e1eebe
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
848 deletions
+0
-848
configure
configure
+0
-13
Makefile
libavcodec/Makefile
+0
-1
allcodecs.c
libavcodec/allcodecs.c
+0
-6
crystalhd.c
libavcodec/crystalhd.c
+0
-825
version_major.h
libavcodec/version_major.h
+0
-3
No files found.
configure
View file @
5b23b18d
...
...
@@ -1930,7 +1930,6 @@ EXTERNAL_LIBRARY_LIST="
HWACCEL_AUTODETECT_LIBRARY_LIST
=
"
amf
audiotoolbox
crystalhd
cuda
cuda_llvm
cuvid
...
...
@@ -3066,7 +3065,6 @@ zmbv_decoder_select="inflate_wrapper"
zmbv_encoder_select
=
"deflate_wrapper"
# hardware accelerators
crystalhd_deps
=
"libcrystalhd_libcrystalhd_if_h"
cuda_deps
=
"ffnvcodec"
cuvid_deps
=
"ffnvcodec"
d3d11va_deps
=
"dxva_h ID3D11VideoDecoder ID3D11VideoContext"
...
...
@@ -3259,7 +3257,6 @@ av1_nvenc_encoder_select="atsc_a53"
h263_v4l2m2m_decoder_deps
=
"v4l2_m2m h263_v4l2_m2m"
h263_v4l2m2m_encoder_deps
=
"v4l2_m2m h263_v4l2_m2m"
h264_amf_encoder_deps
=
"amf"
h264_crystalhd_decoder_select
=
"crystalhd h264_mp4toannexb_bsf h264_parser"
h264_cuvid_decoder_deps
=
"cuvid"
h264_cuvid_decoder_select
=
"h264_mp4toannexb_bsf"
h264_mediacodec_decoder_deps
=
"mediacodec"
...
...
@@ -3307,7 +3304,6 @@ mjpeg_vaapi_encoder_select="cbs_jpeg jpegtables vaapi_encode"
mp3_mf_encoder_deps
=
"mediafoundation"
mpeg1_cuvid_decoder_deps
=
"cuvid"
mpeg1_v4l2m2m_decoder_deps
=
"v4l2_m2m mpeg1_v4l2_m2m"
mpeg2_crystalhd_decoder_select
=
"crystalhd"
mpeg2_cuvid_decoder_deps
=
"cuvid"
mpeg2_mmal_decoder_deps
=
"mmal"
mpeg2_mediacodec_decoder_deps
=
"mediacodec"
...
...
@@ -3315,7 +3311,6 @@ mpeg2_qsv_decoder_select="qsvdec"
mpeg2_qsv_encoder_select
=
"qsvenc"
mpeg2_vaapi_encoder_select
=
"cbs_mpeg2 vaapi_encode"
mpeg2_v4l2m2m_decoder_deps
=
"v4l2_m2m mpeg2_v4l2_m2m"
mpeg4_crystalhd_decoder_select
=
"crystalhd"
mpeg4_cuvid_decoder_deps
=
"cuvid"
mpeg4_mediacodec_decoder_deps
=
"mediacodec"
mpeg4_mediacodec_encoder_deps
=
"mediacodec"
...
...
@@ -3323,8 +3318,6 @@ mpeg4_mmal_decoder_deps="mmal"
mpeg4_omx_encoder_deps
=
"omx"
mpeg4_v4l2m2m_decoder_deps
=
"v4l2_m2m mpeg4_v4l2_m2m"
mpeg4_v4l2m2m_encoder_deps
=
"v4l2_m2m mpeg4_v4l2_m2m"
msmpeg4_crystalhd_decoder_select
=
"crystalhd"
vc1_crystalhd_decoder_select
=
"crystalhd"
vc1_cuvid_decoder_deps
=
"cuvid"
vc1_mmal_decoder_deps
=
"mmal"
vc1_qsv_decoder_select
=
"qsvdec"
...
...
@@ -3348,7 +3341,6 @@ vp9_vaapi_encoder_select="vaapi_encode"
vp9_qsv_encoder_deps
=
"libmfx MFX_CODEC_VP9"
vp9_qsv_encoder_select
=
"qsvenc"
vp9_v4l2m2m_decoder_deps
=
"v4l2_m2m vp9_v4l2_m2m"
wmv3_crystalhd_decoder_select
=
"crystalhd"
av1_qsv_decoder_select
=
"qsvdec"
av1_qsv_encoder_select
=
"qsvenc"
av1_qsv_encoder_deps
=
"libvpl"
...
...
@@ -6532,7 +6524,6 @@ enabled libdrm &&
check_headers linux/dma-buf.h
check_headers linux/perf_event.h
check_headers libcrystalhd/libcrystalhd_if.h
check_headers malloc.h
check_headers mftransform.h
check_headers net/udplite.h
...
...
@@ -7237,10 +7228,6 @@ enabled vdpau &&
enabled vdpau
&&
check_lib vdpau_x11
"vdpau/vdpau.h vdpau/vdpau_x11.h"
vdp_device_create_x11
-lvdpau
-lX11
enabled crystalhd
&&
check_lib crystalhd
"stdint.h libcrystalhd/libcrystalhd_if.h"
DtsCrystalHDVersion
-lcrystalhd
&&
\
warn
"CrystalHD support is deprecated and will be removed, please contact the developers if you are interested"
\
"in maintaining it."
if
enabled vulkan
;
then
check_pkg_config_header_only vulkan
"vulkan >= 1.3.255"
"vulkan/vulkan.h"
"defined VK_VERSION_1_3"
||
check_cpp_condition vulkan
"vulkan/vulkan.h"
"defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 255)"
...
...
libavcodec/Makefile
View file @
5b23b18d
...
...
@@ -85,7 +85,6 @@ OBJS-$(CONFIG_CBS_JPEG) += cbs_jpeg.o
OBJS-$(CONFIG_CBS_MPEG2)
+=
cbs_mpeg2.o
OBJS-$(CONFIG_CBS_VP8)
+=
cbs_vp8.o
vp8data.o
OBJS-$(CONFIG_CBS_VP9)
+=
cbs_vp9.o
OBJS-$(CONFIG_CRYSTALHD)
+=
crystalhd.o
OBJS-$(CONFIG_DEFLATE_WRAPPER)
+=
zlib_wrapper.o
OBJS-$(CONFIG_DOVI_RPU)
+=
dovi_rpu.o
OBJS-$(CONFIG_ERROR_RESILIENCE)
+=
error_resilience.o
...
...
libavcodec/allcodecs.c
View file @
5b23b18d
...
...
@@ -148,7 +148,6 @@ extern const FFCodec ff_h263p_encoder;
extern
const
FFCodec
ff_h263p_decoder
;
extern
const
FFCodec
ff_h263_v4l2m2m_decoder
;
extern
const
FFCodec
ff_h264_decoder
;
extern
const
FFCodec
ff_h264_crystalhd_decoder
;
extern
const
FFCodec
ff_h264_v4l2m2m_decoder
;
extern
const
FFCodec
ff_h264_mediacodec_decoder
;
extern
const
FFCodec
ff_h264_mediacodec_encoder
;
...
...
@@ -207,13 +206,11 @@ extern const FFCodec ff_mpeg2video_encoder;
extern
const
FFCodec
ff_mpeg2video_decoder
;
extern
const
FFCodec
ff_mpeg4_encoder
;
extern
const
FFCodec
ff_mpeg4_decoder
;
extern
const
FFCodec
ff_mpeg4_crystalhd_decoder
;
extern
const
FFCodec
ff_mpeg4_v4l2m2m_decoder
;
extern
const
FFCodec
ff_mpeg4_mmal_decoder
;
extern
const
FFCodec
ff_mpegvideo_decoder
;
extern
const
FFCodec
ff_mpeg1_v4l2m2m_decoder
;
extern
const
FFCodec
ff_mpeg2_mmal_decoder
;
extern
const
FFCodec
ff_mpeg2_crystalhd_decoder
;
extern
const
FFCodec
ff_mpeg2_v4l2m2m_decoder
;
extern
const
FFCodec
ff_mpeg2_qsv_decoder
;
extern
const
FFCodec
ff_mpeg2_mediacodec_decoder
;
...
...
@@ -224,7 +221,6 @@ extern const FFCodec ff_msmpeg4v2_encoder;
extern
const
FFCodec
ff_msmpeg4v2_decoder
;
extern
const
FFCodec
ff_msmpeg4v3_encoder
;
extern
const
FFCodec
ff_msmpeg4v3_decoder
;
extern
const
FFCodec
ff_msmpeg4_crystalhd_decoder
;
extern
const
FFCodec
ff_msp2_decoder
;
extern
const
FFCodec
ff_msrle_encoder
;
extern
const
FFCodec
ff_msrle_decoder
;
...
...
@@ -361,7 +357,6 @@ extern const FFCodec ff_vbn_encoder;
extern
const
FFCodec
ff_vbn_decoder
;
extern
const
FFCodec
ff_vble_decoder
;
extern
const
FFCodec
ff_vc1_decoder
;
extern
const
FFCodec
ff_vc1_crystalhd_decoder
;
extern
const
FFCodec
ff_vc1image_decoder
;
extern
const
FFCodec
ff_vc1_mmal_decoder
;
extern
const
FFCodec
ff_vc1_qsv_decoder
;
...
...
@@ -398,7 +393,6 @@ extern const FFCodec ff_wmv1_decoder;
extern
const
FFCodec
ff_wmv2_encoder
;
extern
const
FFCodec
ff_wmv2_decoder
;
extern
const
FFCodec
ff_wmv3_decoder
;
extern
const
FFCodec
ff_wmv3_crystalhd_decoder
;
extern
const
FFCodec
ff_wmv3image_decoder
;
extern
const
FFCodec
ff_wnv1_decoder
;
extern
const
FFCodec
ff_xan_wc3_decoder
;
...
...
libavcodec/crystalhd.c
deleted
100644 → 0
View file @
98e1eebe
This diff is collapsed.
Click to expand it.
libavcodec/version_major.h
View file @
5b23b18d
...
...
@@ -47,7 +47,4 @@
#define FF_API_AVCODEC_CLOSE (LIBAVCODEC_VERSION_MAJOR < 62)
#define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62)
// reminder to remove CrystalHD decoders on next major bump
#define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61)
#endif
/* AVCODEC_VERSION_MAJOR_H */
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