[SCM] libav/experimental: use coded_width and coded_height instead of width and height
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:52:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 24d3e5a2f2ad2779376753772b321a7390dacb20
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Sun Oct 22 18:33:09 2006 +0000
use coded_width and coded_height instead of width and height
Originally committed as revision 6769 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 118240b..eb78d02 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -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 i;
- s->plane_width[0] = s->avctx->width;
- s->plane_width[1] = s->plane_width[2] = s->avctx->width/2;
- s->plane_height[0] = s->avctx->height;
- s->plane_height[1] = s->plane_height[2] = s->avctx->height/2;
+ s->plane_width[0] = s->avctx->coded_width;
+ s->plane_width[1] = s->plane_width[2] = s->avctx->coded_width/2;
+ s->plane_height[0] = s->avctx->coded_height;
+ s->plane_height[1] = s->plane_height[2] = s->avctx->coded_height/2;
for (i=0; i<3; i++)
s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT].linesize[i];
- s->mb_width = (s->avctx->width+15) / 16;
- s->mb_height = (s->avctx->height+15) / 16;
+ s->mb_width = (s->avctx->coded_width+15) / 16;
+ s->mb_height = (s->avctx->coded_height+15) / 16;
if (s->mb_width > 1000 || s->mb_height > 1000) {
av_log(avctx, AV_LOG_ERROR, "picture too big\n");
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list