Mercurial > mplayer.hg

changeset 29453:3a154fb8f85c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make *avcctx AVCodecContext instead of void.
author cehoyos
date Tue, 11 Aug 2009 18:52:18 +0000
parents e8d71beb79b9
children 28e5ee835b6b
files libmpdemux/demux_rtp.cpp libmpdemux/demux_rtp_codec.cpp
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.cpp	Tue Aug 11 18:44:43 2009 +0000
+++ b/libmpdemux/demux_rtp.cpp	Tue Aug 11 18:52:18 2009 +0000
@@ -117,7 +117,9 @@
 #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 @@
     }
     if (headersize == 3 && h264parserctx) { // h264
       consumed = h264parserctx->parser->parser_parse(h264parserctx,
-                               (AVCodecContext *)avcctx,
+                               avcctx,
                                &poutbuf, &poutbuf_size,
                                dp->buffer, dp->len);
 
--- a/libmpdemux/demux_rtp_codec.cpp	Tue Aug 11 18:44:43 2009 +0000
+++ b/libmpdemux/demux_rtp_codec.cpp	Tue Aug 11 18:52:18 2009 +0000
@@ -29,8 +29,8 @@
 
 #ifdef CONFIG_LIBAVCODEC
 AVCodecParserContext * h264parserctx;
+AVCodecContext *avcctx;
 #endif
-void *avcctx;
 
 // Copied from vlc
 static unsigned char* parseH264ConfigStr( char const* configStr,