diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 15:43:03 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 16:35:28 +0200 |
commit | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch) | |
tree | 866bd99edecd778aee4cd8eb5f34977d0c82a27d /libavutil/imgutils.c | |
parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) | |
download | ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.gz |
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/imgutils.c')
-rw-r--r-- | libavutil/imgutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 9c8216e827..8956ae31ec 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -41,8 +41,8 @@ void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], for (i = 0; i < 4; i++) { const AVComponentDescriptor *comp = &(pixdesc->comp[i]); - if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) { - max_pixsteps[comp->plane] = comp->step_minus1+1; + if (comp->step > max_pixsteps[comp->plane]) { + max_pixsteps[comp->plane] = comp->step; if (max_pixstep_comps) max_pixstep_comps[comp->plane] = i; } |