summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c12
-rw-r--r--libmpdemux/demux_mov.c6
-rw-r--r--libmpdemux/demux_ogg.c6
-rw-r--r--libmpdemux/demux_rtp.cpp4
-rw-r--r--libmpdemux/demux_rtp_codec.cpp4
-rw-r--r--libmpdemux/demux_rtp_internal.h2
-rw-r--r--libmpdemux/demuxer.c18
-rw-r--r--libmpdemux/demuxer.h2
-rw-r--r--libmpdemux/extension.c2
-rw-r--r--libmpdemux/muxer.c2
-rw-r--r--libmpdemux/muxer_mpeg.c2
-rw-r--r--libmpdemux/stheader.h2
12 files changed, 31 insertions, 31 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index b870dff0ac..3e667d2534 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -31,11 +31,11 @@
#include "libavutil/common.h"
-#ifdef USE_QTX_CODECS
+#ifdef CONFIG_QTX_CODECS
#include "loader/qtx/qtxsdk/components.h"
#endif
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
@@ -473,7 +473,7 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest,
if (!(track->encodings[i].scope & type))
continue;
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
if (track->encodings[i].comp_algo == 0)
{
/* zlib encoded track */
@@ -721,7 +721,7 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
MSGTR_MPDEMUX_MKV_UnknownCompression,
track->tnum, e.comp_algo);
}
-#ifndef HAVE_ZLIB
+#ifndef CONFIG_ZLIB
else if (e.comp_algo == 0)
{
mp_msg (MSGT_DEMUX, MSGL_WARN,
@@ -1757,7 +1757,7 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
stream_read(demuxer->stream, dst+8, cnt);
track->realmedia = 1;
-#ifdef USE_QTX_CODECS
+#ifdef CONFIG_QTX_CODECS
}
else if (track->private_size >= sizeof (ImageDescription)
&& !strcmp(track->codec_id, MKV_V_QUICKTIME))
@@ -1783,7 +1783,7 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
bih->biPlanes = 1;
bih->biCompression = idesc->cType;
ImageDesc = idesc;
-#endif /* USE_QTX_CODECS */
+#endif /* CONFIG_QTX_CODECS */
}
else
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 37de352510..2e6d5fc4c0 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -48,7 +48,7 @@
#include "qtpalette.h"
#include "parse_mp4.h" // .MP4 specific stuff
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
@@ -1395,7 +1395,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
trak=NULL;
break;
}
-#ifndef HAVE_ZLIB
+#ifndef CONFIG_ZLIB
case MOV_FOURCC('c','m','o','v'): {
mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVcomprhdr);
return;
@@ -2026,7 +2026,7 @@ static demuxer_t* mov_read_header(demuxer_t* demuxer){
char2int(trak->stdata,12)==MOV_FOURCC('z','l','i','b')
){
int newlen=stream_read_dword(demuxer->stream);
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
// unzip:
z_stream zstrm;
int zret;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 1a7a2cba94..989542df0f 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) {
mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n",
ogg_sub.lines, ogg_sub.text[0]);
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
subcp_recode(&ogg_sub);
#endif
vo_sub = &ogg_sub;
@@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
sh_audio_t* sh_a;
sh_video_t* sh_v;
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
subcp_open(NULL);
#endif
@@ -1486,7 +1486,7 @@ static void demux_close_ogg(demuxer_t* demuxer) {
if(!ogg_d)
return;
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
subcp_close();
#endif
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index e622922822..1e15063027 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -500,7 +500,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
if (dp == NULL) return NULL;
}
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
extern AVCodecParserContext * h264parserctx;
int consumed, poutbuf_size = 1;
const uint8_t *poutbuf = NULL;
@@ -531,7 +531,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
if (headersize == 1) // amr
dp->buffer[0] =
((AMRAudioSource*)bufferQueue->readSource())->lastFrameHeader();
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
} else {
bufferQueue->dp = dp = bufferQueue->nextpacket;
bufferQueue->nextpacket = NULL;
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 33b2dc41eb..4dd2a1908f 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -9,7 +9,7 @@ extern "C" {
#include "libavutil/base64.h"
}
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
AVCodecParserContext * h264parserctx;
#endif
@@ -116,7 +116,7 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
= parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen);
sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen);
delete[] configData;
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
avcodec_register_all();
h264parserctx = av_parser_init(CODEC_ID_H264);
#endif
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 89f6002f98..d504b49c7d 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -10,7 +10,7 @@ extern "C" {
#ifndef DEMUXER_H
#include "demuxer.h"
#endif
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
#include "libavcodec/avcodec.h"
#endif
}
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 6d51b434e8..8d5eb86ab4 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -22,12 +22,12 @@
#include "libaf/af_format.h"
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
#include "libass/ass.h"
#include "libass/ass_mp.h"
#endif
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
#include "libavcodec/avcodec.h"
#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
#error MP_INPUT_BUFFER_PADDING_SIZE is too small!
@@ -88,11 +88,11 @@ extern const demuxer_desc_t demuxer_desc_nut;
const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_rawaudio,
&demuxer_desc_rawvideo,
-#ifdef USE_TV
+#ifdef CONFIG_TV
&demuxer_desc_tv,
#endif
&demuxer_desc_mf,
-#ifdef USE_LIBAVFORMAT
+#ifdef CONFIG_LIBAVFORMAT
&demuxer_desc_lavf_preferred,
#endif
&demuxer_desc_avi,
@@ -116,7 +116,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef HAVE_OGGVORBIS
&demuxer_desc_ogg,
#endif
-#ifdef USE_WIN32DLL
+#ifdef CONFIG_WIN32DLL
&demuxer_desc_avs,
#endif
&demuxer_desc_pva,
@@ -136,7 +136,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef LIBNEMESI
&demuxer_desc_rtp_nemesi,
#endif
-#ifdef USE_LIBAVFORMAT
+#ifdef CONFIG_LIBAVFORMAT
&demuxer_desc_lavf,
#endif
#ifdef MUSEPACK
@@ -264,7 +264,7 @@ void free_sh_sub(sh_sub_t *sh)
{
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
free(sh->extradata);
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
if (sh->ass_track)
ass_free_track(sh->ass_track);
#endif
@@ -906,7 +906,7 @@ static demuxer_t *demux_open_stream(stream_t *stream, int file_format,
sh_video->fps, sh_video->i_bps * 0.008f,
sh_video->i_bps / 1024.0f);
}
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
if (ass_enabled && ass_library) {
for (i = 0; i < MAX_S_STREAMS; ++i) {
sh_sub_t *sh = demuxer->s_streams[i];
@@ -1066,7 +1066,7 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
if (!demuxer->seekable) {
if (demuxer->file_format == DEMUXER_TYPE_AVI)
mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI);
-#ifdef USE_TV
+#ifdef CONFIG_TV
else if (demuxer->file_format == DEMUXER_TYPE_TV)
mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable);
#endif
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 8cea2ace78..da198f1e37 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -7,7 +7,7 @@
#include <string.h>
#include "stream/stream.h"
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
#include "libass/ass_types.h"
#endif
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index 5db36b6f29..a1cd2a49d2 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -52,7 +52,7 @@ static struct {
{ "nsv", DEMUXER_TYPE_NSV },
{ "nsa", DEMUXER_TYPE_NSV },
{ "mpc", DEMUXER_TYPE_MPC },
-#ifdef USE_WIN32DLL
+#ifdef CONFIG_WIN32DLL
{ "avs", DEMUXER_TYPE_AVS },
#endif
{ "302", DEMUXER_TYPE_LAVF },
diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c
index 4c4e5a18cf..d7bda17a61 100644
--- a/libmpdemux/muxer.c
+++ b/libmpdemux/muxer.c
@@ -34,7 +34,7 @@ muxer_t *muxer_new_muxer(int type,stream_t *stream){
if(! muxer_init_muxer_rawaudio(muxer))
goto fail;
break;
-#ifdef USE_LIBAVFORMAT
+#ifdef CONFIG_LIBAVFORMAT
case MUXER_TYPE_LAVF:
if(! muxer_init_muxer_lavf(muxer))
goto fail;
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 2a659b7f00..d2f67e2a54 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -2101,7 +2101,7 @@ static int parse_audio(muxer_stream_t *s, int finalize, unsigned int *nf, double
if(s->b_buffer[i] == 0x0B && s->b_buffer[i+1] == 0x77)
{
srate = 0;
- #ifdef USE_LIBA52
+ #ifdef CONFIG_LIBA52
len = a52_syncinfo(&(s->b_buffer[i]), &dummy, &srate, &dummy);
#else
len = mp_a52_framesize(&(s->b_buffer[i]), &srate);
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 7e761e6879..defdf7e986 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -105,7 +105,7 @@ typedef struct {
int forced_subs_only;
unsigned char* extradata; // extra header data passed from demuxer
int extradata_len;
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
ass_track_t* ass_track; // for SSA/ASS streams (type == 'a')
#endif
char* lang; // track language
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 12:29:49 +0000