mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-28 05:50:43 +00:00
this file got skipped during the API update
Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8d931070fc
commit
a2cfc4d630
@ -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)
|
|||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user