Message ID | 20171003131518.4557-6-nfxjfg@googlemail.com |
---|---|
State | Accepted |
Commit | 5593049466bcd1d3f1ddbfe580be4f36123d7c3d |
Headers | show |
LGTM
On Tue, 3 Oct 2017 15:15:16 +0200 wm4 <nfxjfg@googlemail.com> wrote: > cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and > avoid future merge problems by renaming our decoder. > --- > libavcodec/Makefile | 10 +++++----- > libavcodec/{cuvid.c => cuviddec.c} | 0 > 2 files changed, 5 insertions(+), 5 deletions(-) > rename libavcodec/{cuvid.c => cuviddec.c} (100%) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index c4ec09b1c4..fa3ab8f08a 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -331,7 +331,7 @@ OBJS-$(CONFIG_H264_DECODER) += > h264dec.o h264_cabac.o h264_cavlc.o \ h264_mb.o h264_picture.o \ > h264_refs.o h264_sei.o \ > h264_slice.o h264data.o > -OBJS-$(CONFIG_H264_CUVID_DECODER) += cuvid.o > +OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o > OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o > OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o > @@ -351,7 +351,7 @@ OBJS-$(CONFIG_HAP_ENCODER) += > hapenc.o hap.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o > hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ > hevcdsp.o hevc_filter.o > hevc_data.o -OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o > +OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o > OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o > OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o > @@ -616,7 +616,7 @@ OBJS-$(CONFIG_VC1_DECODER) += > vc1dec.o vc1_block.o vc1_loopfilter.o vc1_mc.o vc1_pred.o vc1.o > vc1data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ > wmv2dsp.o wmv2data.o > -OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuvid.o > +OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o > OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o > OBJS-$(CONFIG_VC1_V4L2M2M_DECODER) += v4l2_m2m_dec.o > @@ -635,7 +635,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o > vp56.o vp56data.o \ vp6dsp.o vp56rac.o > OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o > OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o > -OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o > +OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o > OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec_other.o > OBJS-$(CONFIG_VP8_RKMPP_DECODER) += rkmppdec.o > @@ -645,7 +645,7 @@ OBJS-$(CONFIG_VP8_V4L2M2M_ENCODER) += > v4l2_m2m_enc.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o > vp9data.o vp9dsp.o vp9lpf.o vp9recon.o \ vp9block.o vp9prob.o > vp9mvs.o vp56rac.o \ vp9dsp_8bpp.o vp9dsp_10bpp.o vp9dsp_12bpp.o > -OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o > +OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec.o > OBJS-$(CONFIG_VP9_RKMPP_DECODER) += rkmppdec.o > OBJS-$(CONFIG_VP9_VAAPI_ENCODER) += vaapi_encode_vp9.o > diff --git a/libavcodec/cuvid.c b/libavcodec/cuviddec.c > similarity index 100% > rename from libavcodec/cuvid.c > rename to libavcodec/cuviddec.c Ship it --phil
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c4ec09b1c4..fa3ab8f08a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -331,7 +331,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ h264_mb.o h264_picture.o \ h264_refs.o h264_sei.o \ h264_slice.o h264data.o -OBJS-$(CONFIG_H264_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o @@ -351,7 +351,7 @@ OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_data.o -OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o @@ -616,7 +616,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o vc1_mc.o vc1_pred.o vc1.o vc1data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2dsp.o wmv2data.o -OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VC1_V4L2M2M_DECODER) += v4l2_m2m_dec.o @@ -635,7 +635,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o -OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VP8_RKMPP_DECODER) += rkmppdec.o @@ -645,7 +645,7 @@ OBJS-$(CONFIG_VP8_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o vp9lpf.o vp9recon.o \ vp9block.o vp9prob.o vp9mvs.o vp56rac.o \ vp9dsp_8bpp.o vp9dsp_10bpp.o vp9dsp_12bpp.o -OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP9_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_VP9_VAAPI_ENCODER) += vaapi_encode_vp9.o diff --git a/libavcodec/cuvid.c b/libavcodec/cuviddec.c similarity index 100% rename from libavcodec/cuvid.c rename to libavcodec/cuviddec.c