summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_rtp.cpp
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-10-31 03:19:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:55 +0200
commitc5e462b33d6db445b1c763e89320b1bcb214debb (patch)
tree5091b402fb3cc768fa5dbc718d5681d3d78d191f /libmpdemux/demux_rtp.cpp
parent389c32b5c72897a8b1b3c929c8f278e8980f2290 (diff)
downloadmpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.bz2
mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.xz
build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_rtp.cpp')
-rw-r--r--libmpdemux/demux_rtp.cpp8
1 files changed, 4 insertions, 4 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;