this file got skipped during the API update
authorMike Melanson <mike@multimedia.cx>
Mon, 18 Jul 2005 16:43:14 +0000 (16:43 +0000)
committerMike Melanson <mike@multimedia.cx>
Mon, 18 Jul 2005 16:43:14 +0000 (16:43 +0000)
Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk

vhook/watermark.c

index 1d01540..17323ae 100644 (file)
@@ -307,7 +307,7 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
          */
         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 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
         }
         
         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;
             
         
         /*