Message ID | 20201006040932.235947-1-chris@miceli.net.au |
---|---|
State | Changes Requested |
Headers | show |
Series | [FFmpeg-devel] Add atsc_a53 dependency to h264/hevc decoders | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On 10/6/2020 1:09 AM, Chris Miceli wrote: > As per ticket #8901 there is a compilation issue where there is > an undefined reference when compiled with a minimal set of filters. > This commit remedies that by ensuring decoders which have SEI parsers > import the relevent caption object and hence functionality. > --- > libavcodec/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 421aec984a..d255876d5e 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -96,7 +96,7 @@ OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o > OBJS-$(CONFIG_H264PARSE) += h264_parse.o h2645_parse.o h264_ps.o > OBJS-$(CONFIG_H264PRED) += h264pred.o > OBJS-$(CONFIG_H264QPEL) += h264qpel.o > -OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o hevc_sei.o hevc_data.o > +OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o hevc_sei.o hevc_data.o atsc_a53.o > OBJS-$(CONFIG_HPELDSP) += hpeldsp.o > OBJS-$(CONFIG_HUFFMAN) += huffman.o > OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o > @@ -361,7 +361,7 @@ OBJS-$(CONFIG_H263_V4L2M2M_ENCODER) += v4l2_m2m_enc.o > OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ > h264_direct.o h264_loopfilter.o \ > h264_mb.o h264_picture.o \ > - h264_refs.o h264_sei.o \ > + h264_refs.o h264_sei.o atsc_a53.o \ > h264_slice.o h264data.o > OBJS-$(CONFIG_H264_AMF_ENCODER) += amfenc_h264.o > OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o > @@ -1087,7 +1087,7 @@ OBJS-$(CONFIG_GIF_PARSER) += gif_parser.o > OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o > OBJS-$(CONFIG_H261_PARSER) += h261_parser.o > OBJS-$(CONFIG_H263_PARSER) += h263_parser.o > -OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o > +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o atsc_a53.o > OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o > OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o > OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o Fixed these dependencies in configure instead. Thanks.
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 421aec984a..d255876d5e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -96,7 +96,7 @@ OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o OBJS-$(CONFIG_H264PARSE) += h264_parse.o h2645_parse.o h264_ps.o OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o -OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o hevc_sei.o hevc_data.o +OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o hevc_sei.o hevc_data.o atsc_a53.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o @@ -361,7 +361,7 @@ OBJS-$(CONFIG_H263_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ h264_direct.o h264_loopfilter.o \ h264_mb.o h264_picture.o \ - h264_refs.o h264_sei.o \ + h264_refs.o h264_sei.o atsc_a53.o \ h264_slice.o h264data.o OBJS-$(CONFIG_H264_AMF_ENCODER) += amfenc_h264.o OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o @@ -1087,7 +1087,7 @@ OBJS-$(CONFIG_GIF_PARSER) += gif_parser.o OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o -OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o atsc_a53.o OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o