diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
| commit | dbb38bc389e1af5ed465ed370887d6af4da0cb40 (patch) | |
| tree | 8998bdad7433fa92d6008ebb8a096e9dd1460340 /libavutil/imgutils.c | |
| parent | 90c02ae1429b7f50cefdaeeca04b51f978cd1921 (diff) | |
| parent | 09d243ddd0d939e97f3fe0b7f27320763ee41493 (diff) | |
| download | ffmpeg-dbb38bc389e1af5ed465ed370887d6af4da0cb40.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Fix stack alignment for SSE
avcodec: move some AVCodecContext fields to an internal struct.
avcodec: use av_opt_set() instead of deprecated av_set_string3()
avcodec: fix some const warnings
avcodec: remove pointless AVOption, internal_buffer_count
imgutils: Fix illegal read.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/imgutils.c')
| -rw-r--r-- | libavutil/imgutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 9447779c36..6e97085a76 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -126,7 +126,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh has_plane[desc->comp[i].plane] = 1; total_size = size[0]; - for (i = 1; has_plane[i] && i < 4; i++) { + for (i = 1; i < 4 && has_plane[i]; i++) { int h, s = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; data[i] = data[i-1] + size[i-1]; h = (height + (1 << s) - 1) >> s; |