[SCM] libav/experimental: fixing aspect (hopefully, i couldnt reproduce the bug)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:34:31 UTC 2013
The following commit has been merged in the experimental branch:
commit 706fc4dea67a0d54eb26ce5024b603cf9bf5afa1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Dec 6 15:01:48 2002 +0000
fixing aspect (hopefully, i couldnt reproduce the bug)
Originally committed as revision 1317 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index eed155c..2e6dd8f 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1184,7 +1184,10 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
int y_density = get_bits(&s->gb, 16);
//MN: needs to be checked
- s->avctx->aspect_ratio= s->width*y_density/((float)s->height*x_density);
+ if(x_density)
+ s->avctx->aspect_ratio= s->width*y_density/((float)s->height*x_density);
+ else
+ s->avctx->aspect_ratio= 0.0;
}
else
{
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list