diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
| commit | 6912e7a008acd1464a63b0a00779a3de81b9a8ab (patch) | |
| tree | 67af44d73c8fa23fb60f92898067a98dce3e2390 /libavutil/lzo.h | |
| parent | 04c6ecb7da677049cd52efe2a980e586167e9e5d (diff) | |
| parent | 79042ab37619a234d5fe0f680885a392e966ea6b (diff) | |
| download | ffmpeg-streaming-6912e7a008acd1464a63b0a00779a3de81b9a8ab.zip ffmpeg-streaming-6912e7a008acd1464a63b0a00779a3de81b9a8ab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Group math functions into a separate variable
avutil/mem: K&R formatting cosmetics
avutil/lzo: K&R formatting cosmetics
Conflicts:
configure
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lzo.h')
| -rw-r--r-- | libavutil/lzo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/lzo.h b/libavutil/lzo.h index 060b5c9..14fb62d 100644 --- a/libavutil/lzo.h +++ b/libavutil/lzo.h @@ -32,18 +32,18 @@ #include <stdint.h> /** @name Error flags returned by av_lzo1x_decode - * @{ */ + * @{ */ /// end of the input buffer reached before decoding finished -#define AV_LZO_INPUT_DEPLETED 1 +#define AV_LZO_INPUT_DEPLETED 1 /// decoded data did not fit into output buffer -#define AV_LZO_OUTPUT_FULL 2 +#define AV_LZO_OUTPUT_FULL 2 /// a reference to previously decoded data was wrong #define AV_LZO_INVALID_BACKPTR 4 /// a non-specific error in the compressed bitstream -#define AV_LZO_ERROR 8 +#define AV_LZO_ERROR 8 /** @} */ -#define AV_LZO_INPUT_PADDING 8 +#define AV_LZO_INPUT_PADDING 8 #define AV_LZO_OUTPUT_PADDING 12 /** |
