[FFmpeg-cvslog] libxvid: guess a good aspect when we cant store the exact one.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Sep  8 22:53:14 2013 +0200| [43353bf32c928ea52bdca786bb09eb490dbe8477] | committer: Carl Eugen Hoyos

libxvid: guess a good aspect when we cant store the exact one.

Based on 394781a8.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43353bf32c928ea52bdca786bb09eb490dbe8477
---

 libavcodec/libxvid.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;