summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.cpp8
-rw-r--r--libmpdemux/demux_rtp_codec.cpp4
-rw-r--r--libmpdemux/demux_rtp_internal.h2
-rw-r--r--libmpdemux/demuxer.c14
4 files changed, 0 insertions, 28 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 6799843ee0..7b9ebbe256 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -122,9 +122,7 @@ int rtsp_transport_http = 0;
#endif
extern int rtsp_port;
-#ifdef CONFIG_FFMPEG
extern AVCodecContext *avcctx;
-#endif
extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
struct MPOpts *opts = demuxer->opts;
@@ -401,9 +399,7 @@ extern "C" void demux_close_rtp(demuxer_t* demuxer) {
delete rtpState->videoBufferQueue;
delete[] rtpState->sdpDescription;
delete rtpState;
-#ifdef CONFIG_FFMPEG
av_freep(&avcctx);
-#endif
env->reclaim(); delete scheduler;
}
@@ -560,7 +556,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
if (dp == NULL) return NULL;
}
-#ifdef CONFIG_FFMPEG
extern AVCodecParserContext * h264parserctx;
int consumed, poutbuf_size = 1;
const uint8_t *poutbuf = NULL;
@@ -568,7 +563,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
do {
if (!bufferQueue->nextpacket) {
-#endif
// Schedule the read operation:
bufferQueue->blockingFlag = 0;
bufferQueue->readSource()->getNextFrame(&dp->buffer[headersize], MAX_RTP_FRAME_SIZE - headersize,
@@ -595,7 +589,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
if (headersize == 1) // amr
dp->buffer[0] =
((AMRAudioSource*)bufferQueue->readSource())->lastFrameHeader();
-#ifdef CONFIG_FFMPEG
} else {
bufferQueue->dp = dp = bufferQueue->nextpacket;
bufferQueue->nextpacket = NULL;
@@ -621,7 +614,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
}
}
} while (!poutbuf_size);
-#endif
// Set the "ptsBehind" result parameter:
if (bufferQueue->prevPacketPTS != 0.0
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 68b1964c0c..28fb51e96e 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -27,10 +27,8 @@ extern "C" {
#include "libavutil/base64.h"
}
-#ifdef CONFIG_FFMPEG
AVCodecParserContext * h264parserctx;
AVCodecContext *avcctx;
-#endif
// Copied from vlc
static unsigned char* parseH264ConfigStr( char const* configStr,
@@ -134,7 +132,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
unsigned char* configData
= parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen);
sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen);
-#ifdef CONFIG_FFMPEG
int fooLen;
const uint8_t* fooData;
h264parserctx = av_parser_init(CODEC_ID_H264);
@@ -142,7 +139,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
// Pass the config to the parser
h264parserctx->parser->parser_parse(h264parserctx, avcctx,
&fooData, &fooLen, configData, configLen);
-#endif
delete[] configData;
needVideoFrameRate(demuxer, subsession);
} else if (strcmp(subsession->codecName(), "H261") == 0) {
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 3c17a1e42f..4671fef2d3 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -24,9 +24,7 @@
extern "C" {
#include "demuxer.h"
#include "config.h"
-#ifdef CONFIG_FFMPEG
#include "libavcodec/avcodec.h"
-#endif
}
#ifndef _LIVEMEDIA_HH
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 77d4f05c0b..8afeedac8c 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -43,12 +43,10 @@
#include "libaf/af_format.h"
#include "libmpcodecs/dec_teletext.h"
-#ifdef CONFIG_FFMPEG
#include "libavcodec/avcodec.h"
#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
#error MP_INPUT_BUFFER_PADDING_SIZE is too small!
#endif
-#endif
static void clear_parser(sh_common_t *sh);
@@ -109,9 +107,7 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_tv,
#endif
&demuxer_desc_mf,
-#ifdef CONFIG_FFMPEG
&demuxer_desc_lavf_preferred,
-#endif
&demuxer_desc_avi,
&demuxer_desc_y4m,
&demuxer_desc_asf,
@@ -152,9 +148,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef CONFIG_LIBNEMESI
&demuxer_desc_rtp_nemesi,
#endif
-#ifdef CONFIG_FFMPEG
&demuxer_desc_lavf,
-#endif
#ifdef CONFIG_MUSEPACK
&demuxer_desc_mpc,
#endif
@@ -380,9 +374,7 @@ static 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 CONFIG_FFMPEG
clear_parser((sh_common_t *)sh);
-#endif
talloc_free(sh);
}
@@ -418,9 +410,7 @@ void free_sh_audio(demuxer_t *demuxer, int id)
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh);
free(sh->wf);
free(sh->codecdata);
-#ifdef CONFIG_FFMPEG
clear_parser((sh_common_t *)sh);
-#endif
talloc_free(sh);
}
@@ -450,9 +440,7 @@ void free_sh_video(sh_video_t *sh)
{
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);
free(sh->bih);
-#ifdef CONFIG_FFMPEG
clear_parser((sh_common_t *)sh);
-#endif
talloc_free(sh);
}
@@ -508,7 +496,6 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp)
ds->demuxer->video->packs);
}
-#ifdef CONFIG_FFMPEG
static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format)
{
enum CodecID codec_id = CODEC_ID_NONE;
@@ -612,7 +599,6 @@ void ds_clear_parser(demux_stream_t *ds)
return;
clear_parser(ds->sh);
}
-#endif
void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len,
double pts, off_t pos, int flags)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 12:53:05 +0000