diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:56:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:56:42 +0200 |
| commit | 229a1e8694291c4ae77c27293dc57f78b2e3d223 (patch) | |
| tree | 299c051500cf2106e2a6dd1eac847cc5cacc4afb /libavutil/pixdesc.c | |
| parent | 5727d387fb244aa754847494e199ab3b4e084266 (diff) | |
| parent | b2e059a1ffbdaaa985c6a7dcdd684fa034725238 (diff) | |
Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'
* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
pixdesc: K&R formatting cosmetics
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 97920564b0..73d89a000f 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1957,7 +1957,8 @@ int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) return bits >> log2_pixels; } -char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt) +char *av_get_pix_fmt_string(char *buf, int buf_size, + enum AVPixelFormat pix_fmt) { /* print header */ if (pix_fmt < 0) { |