[MPlayer-cvslog] r32292 - trunk/libmpdemux/demux_rtp.cpp

[diego]

Author: diego
Date: Fri Sep 17 17:02:46 2010
New Revision: 32292

Log:
Rename preprocessor directives: CONFIG_LIBAVCODEC --> CONFIG_FFMPEG
This is a leftover of the FFmpeg library check merge.

Modified:
   trunk/libmpdemux/demux_rtp.cpp

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Fri Sep 17 16:58:17 2010	(r32291)
+++ trunk/libmpdemux/demux_rtp.cpp	Fri Sep 17 17:02:46 2010	(r32292)
@@ -119,7 +119,7 @@ int rtsp_transport_tcp = 0;
 int rtsp_transport_http = 0;
 #endif
 
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
 extern AVCodecContext *avcctx;
 #endif
 
@@ -397,7 +397,7 @@ extern "C" void demux_close_rtp(demuxer_
   delete rtpState->videoBufferQueue;
   delete[] rtpState->sdpDescription;
   delete rtpState;
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
   av_freep(&avcctx);
 #endif
 
@@ -535,7 +535,7 @@ static demux_packet_t* getBuffer(demuxer
   if (dp == NULL) return NULL;
     }
 
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
   extern AVCodecParserContext * h264parserctx;
   int consumed, poutbuf_size = 1;
   const uint8_t *poutbuf = NULL;
@@ -566,7 +566,7 @@ static demux_packet_t* getBuffer(demuxer
   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;