summaryrefslogtreecommitdiff
path: root/libavcodec/libxvid.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-08 22:53:14 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-08 22:53:14 +0200
commit43353bf32c928ea52bdca786bb09eb490dbe8477 (patch)
tree30ce0c88efec1ba66fd6821899335179270b6102 /libavcodec/libxvid.c
parentc54aa2fb0f869ec025933944cbd1634fffe95d09 (diff)
libxvid: guess a good aspect when we cant store the exact one.
Based on 394781a8.
Diffstat (limited to 'libavcodec/libxvid.c')
-rw-r--r--libavcodec/libxvid.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index d2190c8cec..09b07d4b5d 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;