From 958c41d9b69843301352a6350cde6a3eecf9c309 Mon Sep 17 00:00:00 2001 From: iive Date: Fri, 23 Nov 2007 10:44:33 +0000 Subject: Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071. Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo Patch for muxer_lavf.c by me. Approved by michaelni. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 6 +++--- libmpdemux/muxer_lavf.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 2e83185490..70d90398e2 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -64,7 +64,7 @@ m_option_t lavfdopts_conf[] = { typedef struct lavf_priv_t{ AVInputFormat *avif; AVFormatContext *avfc; - ByteIOContext pb; + ByteIOContext *pb; int audio_streams; int video_streams; int sub_streams; @@ -471,9 +471,9 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ url_fopen(&priv->pb, mp_filename, URL_RDONLY); - ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream; + ((URLContext*)(priv->pb->opaque))->priv_data= demuxer->stream; - if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){ + if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){ mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); return NULL; } diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 473ca8432f..8a8851573e 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -40,7 +40,7 @@ extern char *info_comment; typedef struct { //AVInputFormat *avif; AVFormatContext *oc; - ByteIOContext pb; + ByteIOContext *pb; int audio_streams; int video_streams; int64_t last_pts; @@ -317,7 +317,7 @@ static void write_trailer(muxer_t *muxer) av_freep(&(priv->oc->streams[i])); } - url_fclose(&(priv->oc->pb)); + url_fclose(priv->oc->pb); av_free(priv->oc); } -- cgit v1.2.3