mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-03 01:21:46 +02:00
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@outlook.com>
This commit is contained in:
parent
2c984ecbdd
commit
41ab409332
@ -99,9 +99,9 @@ OBJS-$(CONFIG_APM_DEMUXER) += apm.o
|
|||||||
OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o
|
OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o
|
||||||
OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o
|
OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o
|
||||||
OBJS-$(CONFIG_APNG_MUXER) += apngenc.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_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_APTX_HD_MUXER) += rawenc.o
|
||||||
OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o
|
OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o
|
||||||
OBJS-$(CONFIG_ARGO_ASF_DEMUXER) += argo_asf.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_CDG_DEMUXER) += cdg.o
|
||||||
OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o
|
OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o
|
||||||
OBJS-$(CONFIG_CINE_DEMUXER) += cinedec.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_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_CODEC2RAW_MUXER) += rawenc.o
|
||||||
OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o
|
OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o
|
||||||
OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
|
OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
|
||||||
|
@ -20,8 +20,8 @@
|
|||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "libavutil/opt.h"
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "rawdec.h"
|
|
||||||
|
|
||||||
#define APTX_BLOCK_SIZE 4
|
#define APTX_BLOCK_SIZE 4
|
||||||
#define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE)
|
#define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE)
|
||||||
|
@ -22,10 +22,10 @@
|
|||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
#include "libavcodec/codec2utils.h"
|
#include "libavcodec/codec2utils.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
|
#include "libavutil/opt.h"
|
||||||
#include "avio_internal.h"
|
#include "avio_internal.h"
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "rawdec.h"
|
|
||||||
#include "rawenc.h"
|
#include "rawenc.h"
|
||||||
#include "pcm.h"
|
#include "pcm.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user