[FFmpeg-cvslog] avformat/Makefile: Remove rawdec dependency from aptx, codec2 demuxers
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 21:42:06 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Jun 7 21:08:59 2021 +0200| [41ab409332d2b838394a35692629b864181491b8] | committer: Andreas Rheinhardt
avformat/Makefile: Remove rawdec dependency from aptx, codec2 demuxers
These demuxers don't need anything from rawdec; they furthermore only
used rawdec.h to include opt.h. Both of this has been fixed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41ab409332d2b838394a35692629b864181491b8
---
libavformat/Makefile | 8 ++++----
libavformat/aptxdec.c | 2 +-
libavformat/codec2.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9a3fc4cb8f..813ddd3c20 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -99,9 +99,9 @@ OBJS-$(CONFIG_APM_DEMUXER) += apm.o
OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o
OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o
OBJS-$(CONFIG_APNG_MUXER) += apngenc.o
-OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o
+OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o
OBJS-$(CONFIG_APTX_MUXER) += rawenc.o
-OBJS-$(CONFIG_APTX_HD_DEMUXER) += aptxdec.o rawdec.o
+OBJS-$(CONFIG_APTX_HD_DEMUXER) += aptxdec.o
OBJS-$(CONFIG_APTX_HD_MUXER) += rawenc.o
OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o
OBJS-$(CONFIG_ARGO_ASF_DEMUXER) += argo_asf.o
@@ -147,9 +147,9 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o
OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o
OBJS-$(CONFIG_CINE_DEMUXER) += cinedec.o
-OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2.o rawdec.o pcm.o
+OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2.o pcm.o
OBJS-$(CONFIG_CODEC2_MUXER) += codec2.o rawenc.o
-OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2.o rawdec.o pcm.o
+OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2.o pcm.o
OBJS-$(CONFIG_CODEC2RAW_MUXER) += rawenc.o
OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o
OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c
index 489194f49d..dca76ae117 100644
--- a/libavformat/aptxdec.c
+++ b/libavformat/aptxdec.c
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/opt.h"
#include "avformat.h"
-#include "rawdec.h"
#define APTX_BLOCK_SIZE 4
#define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE)
diff --git a/libavformat/codec2.c b/libavformat/codec2.c
index ce249d4470..9c94ed81f9 100644
--- a/libavformat/codec2.c
+++ b/libavformat/codec2.c
@@ -22,10 +22,10 @@
#include <memory.h>
#include "libavcodec/codec2utils.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
#include "avio_internal.h"
#include "avformat.h"
#include "internal.h"
-#include "rawdec.h"
#include "rawenc.h"
#include "pcm.h"
More information about the ffmpeg-cvslog
mailing list