[FFmpeg-cvslog] avcodec/utils: check sar only when width/height are set

Michael Niedermayer git at videolan.org
Fri Jun 20 23:17:04 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 23:02:52 2014 +0200| [fe43facd659f4bf04871d7736701011ebad98932] | committer: Michael Niedermayer

avcodec/utils: check sar only when width/height are set

This fixes loosing the perfectly valid SAR when width=height=0

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9005f27..32af256 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -819,7 +819,8 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
         if (!frame->sample_aspect_ratio.num)
             frame->sample_aspect_ratio = avctx->sample_aspect_ratio;
 
-        if (av_image_check_sar(frame->width, frame->height,
+        if (frame->width && frame->height &&
+            av_image_check_sar(frame->width, frame->height,
                                frame->sample_aspect_ratio) < 0) {
             av_log(avctx, AV_LOG_WARNING, "ignoring invalid SAR: %u/%u\n",
                    frame->sample_aspect_ratio.num,



More information about the ffmpeg-cvslog mailing list