diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_rtp.cpp | 8 | ||||
-rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 4 | ||||
-rw-r--r-- | libmpdemux/demux_rtp_internal.h | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 18 |
4 files changed, 16 insertions, 16 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 87068c39d3..e93616d07f 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -120,7 +120,7 @@ int rtsp_transport_http = 0; #endif extern int rtsp_port; -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG extern AVCodecContext *avcctx; #endif @@ -399,7 +399,7 @@ extern "C" void demux_close_rtp(demuxer_t* demuxer) { delete rtpState->videoBufferQueue; delete[] rtpState->sdpDescription; delete rtpState; -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG av_freep(&avcctx); #endif @@ -537,7 +537,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds, if (dp == NULL) return NULL; } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG extern AVCodecParserContext * h264parserctx; int consumed, poutbuf_size = 1; const uint8_t *poutbuf = NULL; @@ -568,7 +568,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 CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG } else { bufferQueue->dp = dp = bufferQueue->nextpacket; bufferQueue->nextpacket = NULL; diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 7d168c541f..86d41ddae1 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -27,7 +27,7 @@ extern "C" { #include "libavutil/base64.h" } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG AVCodecParserContext * h264parserctx; AVCodecContext *avcctx; #endif @@ -134,7 +134,7 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, unsigned char* configData = parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen); sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG int fooLen; const uint8_t* fooData; avcodec_register_all(); diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index fb8f582b53..7ff4d77a85 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -23,7 +23,7 @@ extern "C" { #include "demuxer.h" -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG #include "libavcodec/avcodec.h" #endif } diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 9906ec85de..378100b180 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -45,7 +45,7 @@ #include "ass_mp.h" -#ifdef CONFIG_LIBAVCODEC +#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! @@ -116,7 +116,7 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_tv, #endif &demuxer_desc_mf, -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG &demuxer_desc_lavf_preferred, #endif &demuxer_desc_avi, @@ -159,7 +159,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBNEMESI &demuxer_desc_rtp_nemesi, #endif -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG &demuxer_desc_lavf, #endif #ifdef CONFIG_MUSEPACK @@ -307,7 +307,7 @@ static void free_sh_sub(sh_sub_t *sh) ass_free_track(sh->ass_track); #endif free(sh->lang); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -346,7 +346,7 @@ void free_sh_audio(demuxer_t *demuxer, int id) free(sh->wf); free(sh->codecdata); free(sh->lang); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -378,7 +378,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_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -436,7 +436,7 @@ static void ds_add_packet_internal(demux_stream_t *ds, demux_packet_t *dp) ds->demuxer->video->packs); } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format) { enum CodecID codec_id = CODEC_ID_NONE; @@ -532,7 +532,7 @@ void ds_clear_parser(demux_stream_t *ds) void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) { -#if PARSE_ON_ADD && defined(CONFIG_LIBAVCODEC) +#if PARSE_ON_ADD && defined(CONFIG_FFMPEG) int len = dp->len; int pos = 0; while (len > 0) { @@ -666,7 +666,7 @@ int ds_fill_buffer(demux_stream_t *ds) break; } if (!demux_fill_buffer(demux, ds)) { -#if PARSE_ON_ADD && defined(CONFIG_LIBAVCODEC) +#if PARSE_ON_ADD && defined(CONFIG_FFMPEG) uint8_t *parsed_start = NULL; int parsed_len = 0; ds_parse(ds->sh, &parsed_start, &parsed_len, MP_NOPTS_VALUE, 0); |