git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0dceefc
)
avcodec/utils: check sar only when width/height are set
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Jun 2014 21:02:52 +0000
(23:02 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Jun 2014 21:02:52 +0000
(23:02 +0200)
This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
9005f27
..
32af256
100644
(file)
--- 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,