[FFmpeg-devel] [PATCH]Guess xvid PAR if necessary

Carl Eugen Hoyos cehoyos at ag.or.at
Sat Sep 7 12:50:50 CEST 2013


Hi!

Attached patch is based on 394781a8, untested.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index d2190c8..09b07d4 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -710,9 +710,11 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     /* Pixel aspect ratio setting */
     if (avctx->sample_aspect_ratio.num < 0 || avctx->sample_aspect_ratio.num > 255 ||
         avctx->sample_aspect_ratio.den < 0 || avctx->sample_aspect_ratio.den > 255) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid pixel aspect ratio %i/%i\n",
+        av_log(avctx, AV_LOG_WARNING,
+               "Invalid pixel aspect ratio %i/%i, limit is 255/255 reducing\n",
                avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
-        return -1;
+        av_reduce(&avctx->sample_aspect_ratio.num, &avctx->sample_aspect_ratio.den,
+                   avctx->sample_aspect_ratio.num,  avctx->sample_aspect_ratio.den, 255);
     }
     xvid_enc_frame.par = XVID_PAR_EXT;
     xvid_enc_frame.par_width  = avctx->sample_aspect_ratio.num;


More information about the ffmpeg-devel mailing list