diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 23:49:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 23:49:33 +0200 |
| commit | 7caaa72e624812e87c25af456310599f2e091b1c (patch) | |
| tree | e47a6b07d2eabedcf0413413e61161fa6e6827b5 /libavcodec | |
| parent | 43497d8a838e21e7327452a52c75d397f004d7d3 (diff) | |
| parent | 43353bf32c928ea52bdca786bb09eb490dbe8477 (diff) | |
| download | ffmpeg-7caaa72e624812e87c25af456310599f2e091b1c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
libxvid: guess a good aspect when we cant store the exact one.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libxvid.c | 6 |
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; |