diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
commit | 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch) | |
tree | f90c2ac5f9642183106114a81bfb6c979622ea1f /libmpdemux/demux_rtp.cpp | |
parent | fc2d040b2248adaac816b999a90ad452ee1f2be6 (diff) | |
download | mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2 mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz |
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.
Diffstat (limited to 'libmpdemux/demux_rtp.cpp')
-rw-r--r-- | libmpdemux/demux_rtp.cpp | 8 |
1 files changed, 0 insertions, 8 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 |