[Ffmpeg-cvslog] CVS: ffmpeg/vhook watermark.c,1.3,1.4

[Mike Melanson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/vhook
In directory mail:/var2/tmp/cvs-serv5904/vhook

Modified Files:
	watermark.c 
Log Message:
this file got skipped during the API update


Index: watermark.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/watermark.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- watermark.c	26 May 2005 09:18:38 -0000	1.3
+++ watermark.c	18 Jul 2005 16:43:14 -0000	1.4
@@ -307,7 +307,7 @@
          */
         ci->videoStream=-1;
         for(ci->i = 0; ci->i < ci->pFormatCtx->nb_streams; ci->i++)
-            if(ci->pFormatCtx->streams[ci->i]->codec.codec_type==CODEC_TYPE_VIDEO)
+            if(ci->pFormatCtx->streams[ci->i]->codec->codec_type==CODEC_TYPE_VIDEO)
             {
                 ci->videoStream = ci->i;
                 break;
@@ -318,11 +318,11 @@
         }
         
         ci->st = ci->pFormatCtx->streams[ci->videoStream];
-        ci->x_size = ci->st->codec.width;
-        ci->y_size = ci->st->codec.height;
+        ci->x_size = ci->st->codec->width;
+        ci->y_size = ci->st->codec->height;
         
         // Get a pointer to the codec context for the video stream
-        ci->pCodecCtx = &ci->pFormatCtx->streams[ci->videoStream]->codec;
+        ci->pCodecCtx = ci->pFormatCtx->streams[ci->videoStream]->codec;
             
         
         /*