[MPlayer-cvslog] r29495 - in trunk/libmpdemux: demux_rtp.cpp demux_rtp_codec.cpp

[cehoyos]

Author: cehoyos
Date: Tue Aug 11 20:52:18 2009
New Revision: 29495

Log:
Make *avcctx AVCodecContext instead of void.

Modified:
   trunk/libmpdemux/demux_rtp.cpp
   trunk/libmpdemux/demux_rtp_codec.cpp

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Tue Aug 11 20:44:43 2009	(r29494)
+++ trunk/libmpdemux/demux_rtp.cpp	Tue Aug 11 20:52:18 2009	(r29495)
@@ -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
     }
     if (headersize == 3 && h264parserctx) { // h264
       consumed = h264parserctx->parser->parser_parse(h264parserctx,
-                               (AVCodecContext *)avcctx,
+                               avcctx,
                                &poutbuf, &poutbuf_size,
                                dp->buffer, dp->len);
 

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	Tue Aug 11 20:44:43 2009	(r29494)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Tue Aug 11 20:52:18 2009	(r29495)
@@ -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,