RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-19 14:26:57 +00:00
Code Issues Releases Wiki Activity

Make *avcctx AVCodecContext instead of void.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29495 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2009-08-11 18:52:18 +00:00
parent 6a3c6ad075
commit 36ebca92d2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/demux_rtp.cpp
View File

@ -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);

2
libmpdemux/demux_rtp_codec.cpp
View File

@ -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,