diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:46:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:46:19 +0200 |
| commit | 39354d608933fe37a5ec86de4c691bcb46df0dac (patch) | |
| tree | d503a0a3bf2da5e070d456c1b683bfaf5b92aed8 /libavcodec/jpeglsdec.h | |
| parent | 0d83b5722e2875cd4a2ac3574af72b5be633c73d (diff) | |
| parent | ff4fc5ef12a37716c5c5d8928a2db92428e916ec (diff) | |
| download | android_external_ffmpeg-39354d608933fe37a5ec86de4c691bcb46df0dac.tar.gz android_external_ffmpeg-39354d608933fe37a5ec86de4c691bcb46df0dac.tar.bz2 android_external_ffmpeg-39354d608933fe37a5ec86de4c691bcb46df0dac.zip | |
Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'
* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
jpegls: K&R formatting cosmetics
Conflicts:
libavcodec/jpegls.c
libavcodec/jpegls.h
libavcodec/jpeglsdec.c
libavcodec/jpeglsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
| -rw-r--r-- | libavcodec/jpeglsdec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/jpeglsdec.h b/libavcodec/jpeglsdec.h index 5204ecb205..0cafaba7a4 100644 --- a/libavcodec/jpeglsdec.h +++ b/libavcodec/jpeglsdec.h @@ -36,6 +36,7 @@ */ int ff_jpegls_decode_lse(MJpegDecodeContext *s); -int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv); +int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, + int point_transform, int ilv); #endif /* AVCODEC_JPEGLSDEC_H */ |