diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 21:14:08 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 21:40:57 +0400 |
commit | d210e9741e7cff8cdc89b2759d8fb0e4ea2213ab (patch) | |
tree | 0b714415b4832909482b296787f007c514b0a772 /libavcodec/rv34.c | |
parent | 6c6dc8ccea56d264d54c677215fc8faf94587919 (diff) |
rv34: fix aspect ratio
Fixes part of Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
-rw-r--r-- | libavcodec/rv34.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index d71c71a160..462cef91ad 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1589,6 +1589,16 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) return got_picture; } +static AVRational update_sar(int old_w, int old_h, AVRational sar, int new_w, int new_h) +{ + // attempt to keep aspect during typical resolution switches + if (!sar.num) + sar = (AVRational){1, 1}; + + sar = av_mul_q(sar, (AVRational){new_h * old_w, new_w * old_h}); + return sar; +} + int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *got_picture_ptr, AVPacket *avpkt) @@ -1664,6 +1674,9 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, if (av_image_check_size(si.width, si.height, 0, s->avctx)) return AVERROR_INVALIDDATA; + s->avctx->sample_aspect_ratio = update_sar( + s->width, s->height, s->avctx->sample_aspect_ratio, + si.width, si.height); s->width = si.width; s->height = si.height; avcodec_set_dimensions(s->avctx, s->width, s->height); |