# HG changeset patch # User cehoyos # Date 1250016738 0 # Node ID 3a154fb8f85c065985cd46d805b83da08d5dd71f # Parent e8d71beb79b97272b971d6327a9d5c07be651f40 Make *avcctx AVCodecContext instead of void. diff -r e8d71beb79b9 -r 3a154fb8f85c libmpdemux/demux_rtp.cpp --- 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); diff -r e8d71beb79b9 -r 3a154fb8f85c libmpdemux/demux_rtp_codec.cpp --- 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,