[FFmpeg-cvslog] avcodec/mjpegenc_common: Store approximate aspect if exact cannot be stored
Michael Niedermayer
git at videolan.org
Wed Apr 27 05:42:57 CEST 2016
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sat Mar 19 15:41:30 2016 +0100| [d7c15fb25a650bc9fed8c031bbe9ecbb5ce7985c] | committer: Michael Niedermayer
avcodec/mjpegenc_common: Store approximate aspect if exact cannot be stored
Fixes Ticket5244
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 068026b0f7845e0f1850094d974f60d181480d64)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7c15fb25a650bc9fed8c031bbe9ecbb5ce7985c
---
libavcodec/mjpegenc_common.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 64e1425..f3c8df2 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -119,6 +119,16 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
uint8_t *ptr;
if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
+ AVRational sar = avctx->sample_aspect_ratio;
+
+ if (sar.num > 65535 || sar.den > 65535) {
+ if (!av_reduce(&sar.num, &sar.den, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 65535))
+ av_log(avctx, AV_LOG_WARNING,
+ "Cannot store exact aspect ratio %d:%d\n",
+ avctx->sample_aspect_ratio.num,
+ avctx->sample_aspect_ratio.den);
+ }
+
/* JFIF header */
put_marker(p, APP0);
put_bits(p, 16, 16);
@@ -128,8 +138,8 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
* released revision. */
put_bits(p, 16, 0x0102);
put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
- put_bits(p, 16, avctx->sample_aspect_ratio.num);
- put_bits(p, 16, avctx->sample_aspect_ratio.den);
+ put_bits(p, 16, sar.num);
+ put_bits(p, 16, sar.den);
put_bits(p, 8, 0); /* thumbnail width */
put_bits(p, 8, 0); /* thumbnail height */
}
More information about the ffmpeg-cvslog
mailing list