[Ffmpeg-cvslog] CVS: ffmpeg/libavformat beosaudio.cpp, 1.11, 1.12 dc1394.c, 1.3, 1.4 grab_bktr.c, 1.1, 1.2

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv1226

Modified Files:
	beosaudio.cpp dc1394.c grab_bktr.c 
Log Message:
minor compilation fix
A few files are not in sync with the change of AVStream's codec
member from inline struct to pointer. 
patch by (Sam Hocevar: sam, zoy org)


Index: beosaudio.cpp
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/beosaudio.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- beosaudio.cpp	13 Sep 2003 09:20:12 -0000	1.11
+++ beosaudio.cpp	11 Aug 2005 22:26:12 -0000	1.12
@@ -287,8 +287,8 @@
     int ret;
 
     st = s1->streams[0];
-    s->sample_rate = st->codec.sample_rate;
-    s->channels = st->codec.channels;
+    s->sample_rate = st->codec->sample_rate;
+    s->channels = st->codec->channels;
     ret = audio_open(s, 1, NULL);
     if (ret < 0)
         return -EIO;
@@ -365,10 +365,10 @@
         return -EIO;
     }
     /* take real parameters */
-    st->codec.codec_type = CODEC_TYPE_AUDIO;
-    st->codec.codec_id = s->codec_id;
-    st->codec.sample_rate = s->sample_rate;
-    st->codec.channels = s->channels;
+    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_id = s->codec_id;
+    st->codec->sample_rate = s->sample_rate;
+    st->codec->channels = s->channels;
     return 0;
     av_set_pts_info(s1, 48, 1, 1000000);  /* 48 bits pts in us */
 }

Index: dc1394.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/dc1394.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dc1394.c	30 Apr 2005 21:43:58 -0000	1.3
+++ dc1394.c	11 Aug 2005 22:26:12 -0000	1.4
@@ -80,13 +80,13 @@
     if (!vst)
 	return -1;
     av_set_pts_info(vst, 64, 1, 1000);
-    vst->codec.codec_type = CODEC_TYPE_VIDEO;
-    vst->codec.codec_id = CODEC_ID_RAWVIDEO;
-    vst->codec.time_base.den = fps->frame_rate;
-    vst->codec.time_base.num = 1000;
-    vst->codec.width = fmt->width;
-    vst->codec.height = fmt->height;
-    vst->codec.pix_fmt = fmt->pix_fmt;
+    vst->codec->codec_type = CODEC_TYPE_VIDEO;
+    vst->codec->codec_id = CODEC_ID_RAWVIDEO;
+    vst->codec->time_base.den = fps->frame_rate;
+    vst->codec->time_base.num = 1000;
+    vst->codec->width = fmt->width;
+    vst->codec->height = fmt->height;
+    vst->codec->pix_fmt = fmt->pix_fmt;
 
     /* packet init */
     av_init_packet(&dc1394->packet);
@@ -97,7 +97,7 @@
     dc1394->current_frame = 0;
     dc1394->fps = fps->frame_rate;
 
-    vst->codec.bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
+    vst->codec->bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
     
     /* Now lets prep the hardware */
     dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */

Index: grab_bktr.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/grab_bktr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grab_bktr.c	25 Jun 2005 09:04:08 -0000	1.1
+++ grab_bktr.c	11 Aug 2005 22:26:12 -0000	1.2
@@ -268,13 +268,13 @@
     s->frame_rate_base = frame_rate_base;
     s->per_frame = ((u_int64_t)1000000 * s->frame_rate_base) / s->frame_rate;
 
-    st->codec.codec_type = CODEC_TYPE_VIDEO;
-    st->codec.pix_fmt = PIX_FMT_YUV420P;
-    st->codec.codec_id = CODEC_ID_RAWVIDEO;
-    st->codec.width = width;
-    st->codec.height = height;
-    st->codec.time_base.den = frame_rate;
-    st->codec.time_base.num = frame_rate_base;
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->pix_fmt = PIX_FMT_YUV420P;
+    st->codec->codec_id = CODEC_ID_RAWVIDEO;
+    st->codec->width = width;
+    st->codec->height = height;
+    st->codec->time_base.den = frame_rate;
+    st->codec->time_base.num = frame_rate_base;
 
     if (ap->standard) {
         if (!strcasecmp(ap->standard, "pal"))