From 36ebca92d280fdbbc1597e7e6c5a6f77044590d2 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 11 Aug 2009 18:52:18 +0000
Subject: Make *avcctx AVCodecContext instead of void.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29495 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_rtp.cpp       | 6 ++++--
 libmpdemux/demux_rtp_codec.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 513307e5c9..6af3acc676 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -117,7 +117,9 @@ int rtsp_transport_tcp = 0;
 #endif
 
 extern int rtsp_port;
-extern void *avcctx;
+#ifdef CONFIG_LIBAVCODEC
+extern AVCodecContext *avcctx;
+#endif
 
 extern "C" int audio_id, video_id, dvdsub_id;
 extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
@@ -565,7 +567,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
     }
     if (headersize == 3 && h264parserctx) { // h264
       consumed = h264parserctx->parser->parser_parse(h264parserctx,
-                               (AVCodecContext *)avcctx,
+                               avcctx,
                                &poutbuf, &poutbuf_size,
                                dp->buffer, dp->len);
 
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index fbfbb3258f..32bfc43647 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -29,8 +29,8 @@ extern "C" {
 
 #ifdef CONFIG_LIBAVCODEC
 AVCodecParserContext * h264parserctx;
+AVCodecContext *avcctx;
 #endif
-void *avcctx;
 
 // Copied from vlc
 static unsigned char* parseH264ConfigStr( char const* configStr,
-- 
cgit v1.2.3