[MPlayer-cvslog] r25145 - in trunk/libmpdemux: demux_lavf.c muxer_lavf.c

[iive]

Author: iive
Date: Fri Nov 23 11:44:33 2007
New Revision: 25145

Log:
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.


Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/muxer_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Fri Nov 23 11:44:33 2007
@@ -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(demuxe
     
     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;
     }

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	(original)
+++ trunk/libmpdemux/muxer_lavf.c	Fri Nov 23 11:44:33 2007
@@ -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);
 }