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:
2cbadf5
)
avutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize()
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 12 Jun 2015 21:23:59 +0000
(23:23 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 12 Jun 2015 21:23:59 +0000
(23:23 +0200)
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/imgutils.c
patch
|
blob
|
history
diff --git
a/libavutil/imgutils.c
b/libavutil/imgutils.c
index
ef0e671
..
9c8216e
100644
(file)
--- a/
libavutil/imgutils.c
+++ b/
libavutil/imgutils.c
@@
-78,7
+78,7
@@
int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane)
int max_step [4]; /* max pixel step for each plane */
int max_step_comp[4]; /* the component for each plane which has the max pixel step */
- if (
(unsigned)pix_fmt >= AV_PIX_FMT_NB
|| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
+ if (
!desc
|| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
return AVERROR(EINVAL);
av_image_fill_max_pixsteps(max_step, max_step_comp, desc);