From 69a45b8a4998e61efd40b054e70abc722f7e155f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 13 Dec 2021 20:12:34 +0100 Subject: [PATCH] avcodec/Makefile: Remove superfluous avformat->DNXHD dependencies There is no mxfenc dependency any more since commit b9a26b9d55f77ebbff3596e46be54bb5fed469d3. Also remove a dnxhddata.h inclusion in mxfenc that was forgotten in the very same commit. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 2 -- libavformat/mxfenc.c | 1 - 2 files changed, 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4122a9b144d6d..fb90ecea84146 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -983,14 +983,12 @@ OBJS-$(CONFIG_VP8_QSV_HWACCEL) += qsvdec.o OBJS-$(CONFIG_ISO_MEDIA) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddata.o OBJS-$(CONFIG_FITS_DEMUXER) += fits.o OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MATROSKA_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o -OBJS-$(CONFIG_MXF_MUXER) += dnxhddata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o OBJS-$(CONFIG_SPDIF_MUXER) += dca.o diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index fcd9afda2a3e2..00bbe581493bd 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -48,7 +48,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" -#include "libavcodec/dnxhddata.h" #include "libavcodec/dv_profile.h" #include "libavcodec/h264_ps.h" #include "libavcodec/golomb.h"