mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
use coded_width and coded_height instead of width and height
Originally committed as revision 6769 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
47babca839
commit
24d3e5a2f2
@ -462,16 +462,16 @@ static int vp56_size_changed(AVCodecContext *avctx, vp56_context_t *s)
|
|||||||
int stride = s->frames[VP56_FRAME_CURRENT].linesize[0];
|
int stride = s->frames[VP56_FRAME_CURRENT].linesize[0];
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
s->plane_width[0] = s->avctx->width;
|
s->plane_width[0] = s->avctx->coded_width;
|
||||||
s->plane_width[1] = s->plane_width[2] = s->avctx->width/2;
|
s->plane_width[1] = s->plane_width[2] = s->avctx->coded_width/2;
|
||||||
s->plane_height[0] = s->avctx->height;
|
s->plane_height[0] = s->avctx->coded_height;
|
||||||
s->plane_height[1] = s->plane_height[2] = s->avctx->height/2;
|
s->plane_height[1] = s->plane_height[2] = s->avctx->coded_height/2;
|
||||||
|
|
||||||
for (i=0; i<3; i++)
|
for (i=0; i<3; i++)
|
||||||
s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT].linesize[i];
|
s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT].linesize[i];
|
||||||
|
|
||||||
s->mb_width = (s->avctx->width+15) / 16;
|
s->mb_width = (s->avctx->coded_width+15) / 16;
|
||||||
s->mb_height = (s->avctx->height+15) / 16;
|
s->mb_height = (s->avctx->coded_height+15) / 16;
|
||||||
|
|
||||||
if (s->mb_width > 1000 || s->mb_height > 1000) {
|
if (s->mb_width > 1000 || s->mb_height > 1000) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "picture too big\n");
|
av_log(avctx, AV_LOG_ERROR, "picture too big\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user