Mercurial > mplayer.hg

changeset 25117:c6702b710b2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author iive
date Fri, 23 Nov 2007 10:44:33 +0000
parents 1e76bb01331f
children 0c129372fd59
files libmpdemux/demux_lavf.c libmpdemux/muxer_lavf.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Fri Nov 23 07:25:39 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Fri Nov 23 10:44:33 2007 +0000
@@ -64,7 +64,7 @@
 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 @@
     
     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;
     }
--- a/libmpdemux/muxer_lavf.c	Fri Nov 23 07:25:39 2007 +0000
+++ b/libmpdemux/muxer_lavf.c	Fri Nov 23 10:44:33 2007 +0000
@@ -40,7 +40,7 @@
 typedef struct {
 	//AVInputFormat *avif;
 	AVFormatContext *oc;
-	ByteIOContext pb;
+	ByteIOContext *pb;
 	int audio_streams;
 	int video_streams;
 	int64_t last_pts;
@@ -317,7 +317,7 @@
 		av_freep(&(priv->oc->streams[i]));
 	}
 
-	url_fclose(&(priv->oc->pb));
+	url_fclose(priv->oc->pb);
 
 	av_free(priv->oc);
 }