Quoting Diego Biurrun (2016-06-28 11:16:09) > This fixes standalone compilation of the SVQ3 decoder, which had > incomplete dependencies related to H.264 parsing. > --- > configure | 7 ++++--- > libavcodec/Makefile | 11 +++++------ > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/configure b/configure > index cc649ac..210295c 100755 > --- a/configure > +++ b/configure > @@ -1686,6 +1686,7 @@ CONFIG_EXTRA=" > h263dsp > h264chroma > h264dsp > + h264parse > h264pred > h264qpel > hpeldsp > @@ -1965,7 +1966,7 @@ h263_decoder_select="error_resilience h263_parser > h263dsp mpeg_er mpegvideo qpel > h263_encoder_select="aandcttables h263dsp mpegvideoenc" > h263i_decoder_select="h263_decoder" > h263p_encoder_select="h263_encoder" > -h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel > videodsp" > +h264_decoder_select="cabac golomb h264chroma h264dsp h264parse h264pred > h264qpel videodsp" > h264_decoder_suggest="error_resilience" > hap_decoder_select="snappy texturedsp" > hap_encoder_deps="libsnappy" > @@ -2053,7 +2054,7 @@ sipr_decoder_select="lsp" > sp5x_decoder_select="mjpeg_decoder" > svq1_decoder_select="hpeldsp" > svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc" > -svq3_decoder_select="golomb h264dsp h264pred hpeldsp tpeldsp videodsp" > +svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp > videodsp" > svq3_decoder_suggest="zlib" > tak_decoder_select="audiodsp" > tdsc_decoder_deps="zlib" > @@ -2207,7 +2208,7 @@ nvenc_h264_encoder_deps="nvenc" > nvenc_hevc_encoder_deps="nvenc" > > # parsers > -h264_parser_select="golomb h264dsp" > +h264_parser_select="golomb h264dsp h264parse" > hevc_parser_select="golomb" > mpegvideo_parser_select="mpegvideo mpeg12framerate" > mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp" > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index ef7f35e..09c25ec 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -59,6 +59,7 @@ OBJS-$(CONFIG_GOLOMB) += golomb.o > OBJS-$(CONFIG_H263DSP) += h263dsp.o > OBJS-$(CONFIG_H264CHROMA) += h264chroma.o > 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_HPELDSP) += hpeldsp.o > @@ -252,10 +253,9 @@ OBJS-$(CONFIG_H263_ENCODER) += > mpeg4videoenc.o mpeg4video.o \ > h263.o ituh263enc.o flvenc.o > h263data.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_ps.o > \ > + h264_mb.o h264_picture.o \ > h264_refs.o h264_sei.o \ > - h264_slice.o h264data.o > h264_parse.o \ > - h2645_parse.o > + h264_slice.o h264data.o > OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o > OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o > OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o > @@ -428,7 +428,7 @@ OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o > OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o svq13.o h263data.o > OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o h263data.o \ > h263.o ituh263enc.o > -OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o svq13.o mpegutils.o > h264_parse.o h264data.o > +OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o svq13.o mpegutils.o > h264data.o > OBJS-$(CONFIG_TAK_DECODER) += takdec.o tak.o > OBJS-$(CONFIG_TARGA_DECODER) += targa.o > OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o > @@ -715,8 +715,7 @@ OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o > flacdata.o flac.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_parse.o > h2645_parse.o \ > - h264_ps.o h264_sei.o h264data.o > +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o > OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o h2645_parse.o > hevc_ps.o hevc_data.o > OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o > OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o > -- > 2.7.3
Fine with me. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
