Commit 7936af98 authored by melanson's avatar melanson

this file got skipped during the API update


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4455 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5e7aaa23
...@@ -307,7 +307,7 @@ int get_watermark_picture(ContextInfo *ci, int cleanup) ...@@ -307,7 +307,7 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
*/ */
ci->videoStream=-1; ci->videoStream=-1;
for(ci->i = 0; ci->i < ci->pFormatCtx->nb_streams; ci->i++) 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; ci->videoStream = ci->i;
break; break;
...@@ -318,11 +318,11 @@ int get_watermark_picture(ContextInfo *ci, int cleanup) ...@@ -318,11 +318,11 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
} }
ci->st = ci->pFormatCtx->streams[ci->videoStream]; ci->st = ci->pFormatCtx->streams[ci->videoStream];
ci->x_size = ci->st->codec.width; ci->x_size = ci->st->codec->width;
ci->y_size = ci->st->codec.height; ci->y_size = ci->st->codec->height;
// Get a pointer to the codec context for the video stream // 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;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment