Mercurial > mplayer.hg

diff libmpdemux/demux_rtp_codec.cpp @ 32142:4614728cab25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build system: Merge all FFmpeg library checks into a single FFmpeg check. There is little point in assuming that some parts of FFmpeg might be available without the others. Plus, mixing and matching static and shared FFmpeg libraries was never supported.
author diego
date Mon, 13 Sep 2010 18:19:25 +0000
parents d0f8ed8e1f27
children 8fa2f43cb760
line wrap: on
line diff
--- a/libmpdemux/demux_rtp_codec.cpp	Mon Sep 13 18:09:29 2010 +0000
+++ b/libmpdemux/demux_rtp_codec.cpp	Mon Sep 13 18:19:25 2010 +0000
@@ -27,7 +27,7 @@
 #include "libavutil/base64.h"
 }
 
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
 AVCodecParserContext * h264parserctx;
 AVCodecContext *avcctx;
 #endif
@@ -134,7 +134,7 @@
     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();