mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-11 17:55:21 +00:00
avformat/vvc: Don't use ff_copy_bits()
There is no benefit in using it: The fast path of copying is not taken because of misalignment; furthermore we are only dealing with a few byte here anyway, so simply copy the bytes manually, avoiding the dependency on bitstream.c in lavf (which also contains a function that is completely unused in lavf). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
52fb49a8a3
commit
4482b3353d
@ -728,7 +728,6 @@ OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o
|
||||
# Objects duplicated from other libraries for shared builds
|
||||
SHLIBOBJS += log2_tab.o to_upper4.o
|
||||
SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
|
||||
SHLIBOBJS-$(CONFIG_ISO_WRITER) += bitstream.o
|
||||
SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
|
||||
SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
|
||||
SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
|
||||
|
@ -1 +0,0 @@
|
||||
#include "libavcodec/bitstream.c"
|
@ -757,8 +757,8 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc)
|
||||
put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag);
|
||||
put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag);
|
||||
av_assert0(vvcc->ptl.num_bytes_constraint_info);
|
||||
if (vvcc->ptl.num_bytes_constraint_info > 1)
|
||||
ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8);
|
||||
for (int i = 0; i < vvcc->ptl.num_bytes_constraint_info - 1; i++)
|
||||
put_bits(&pbc, 8, vvcc->ptl.general_constraint_info[i]);
|
||||
put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f);
|
||||
flush_put_bits(&pbc);
|
||||
avio_write(pb, buf, put_bytes_output(&pbc));
|
||||
|
@ -7,7 +7,6 @@ libavdevice/file_open.c
|
||||
libavdevice/reverse.c
|
||||
libavfilter/file_open.c
|
||||
libavfilter/log2_tab.c
|
||||
libavformat/bitstream.c
|
||||
libavformat/file_open.c
|
||||
libavformat/golomb_tab.c
|
||||
libavformat/log2_tab.c
|
||||
|
Loading…
Reference in New Issue
Block a user