| Message ID | AM7PR03MB666072BE629D71EFF7053C138F769@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 69a45b8a4998e61efd40b054e70abc722f7e155f |
| Headers | show |
| Series | [FFmpeg-devel,01/11] avcodec/Makefile: Remove superfluous avformat->DNXHD dependencies | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > 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 <andreas.rheinhardt@outlook.com> > --- > libavcodec/Makefile | 2 -- > libavformat/mxfenc.c | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 4122a9b144..fb90ecea84 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 fcd9afda2a..00bbe58149 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" > Ping for this patchset. - Andreas
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4122a9b144..fb90ecea84 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 fcd9afda2a..00bbe58149 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"
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 <andreas.rheinhardt@outlook.com> --- libavcodec/Makefile | 2 -- libavformat/mxfenc.c | 1 - 2 files changed, 3 deletions(-)