diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:24:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:29:42 +0100 |
| commit | a00d4c5956e178296c31a631679618be4910ba5a (patch) | |
| tree | dd8c4ae7365165403d572b50aefa8f916e968688 /libavcodec/png.c | |
| parent | b361a0bf1fbbfa3d090e6d8db5aca6cbed8260b3 (diff) | |
| parent | c598b569fb3d1f4b6c4868fe64f6989254df5186 (diff) | |
| download | ffmpeg-a00d4c5956e178296c31a631679618be4910ba5a.tar.gz | |
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png.c')
| -rw-r--r-- | libavcodec/png.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/png.c b/libavcodec/png.c index b398d91000..ef52b51bd4 100644 --- a/libavcodec/png.c +++ b/libavcodec/png.c @@ -66,7 +66,7 @@ int ff_png_pass_row_size(int pass, int bits_per_pixel, int width) xmin = ff_png_pass_xmin[pass]; if (width <= xmin) return 0; - shift = ff_png_pass_xshift[pass]; + shift = ff_png_pass_xshift[pass]; pass_width = (width - xmin + (1 << shift) - 1) >> shift; return (pass_width * bits_per_pixel + 7) >> 3; } |