Mercurial > mplayer.hg
changeset 32208:4cd07921bec2
Rename preprocessor directives: CONFIG_LIBAVCODEC --> CONFIG_FFMPEG
This is a leftover of the FFmpeg library check merge.
| author | diego |
|---|---|
| date | Fri, 17 Sep 2010 15:02:46 +0000 |
| parents | e40d435554b6 |
| children | ef21cbba62ee |
| files | libmpdemux/demux_rtp.cpp |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.cpp Fri Sep 17 14:58:17 2010 +0000 +++ b/libmpdemux/demux_rtp.cpp Fri Sep 17 15:02:46 2010 +0000 @@ -119,7 +119,7 @@ int rtsp_transport_http = 0; #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG extern AVCodecContext *avcctx; #endif @@ -397,7 +397,7 @@ delete rtpState->videoBufferQueue; delete[] rtpState->sdpDescription; delete rtpState; -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG av_freep(&avcctx); #endif @@ -535,7 +535,7 @@ 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 @@ 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;