diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:39:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:55:31 +0100 |
| commit | ae3313e1548641e3b4a61520e119729a8b61e061 (patch) | |
| tree | c02a97bdede1293f5b180ebfa1ac089cdf8ab8fb /libavcodec/vp8.h | |
| parent | af3b6aed0da5e292897b3be099c3cc7a3a44e2c4 (diff) | |
| parent | 53c20f17c78d1d8a0fc2505868f201e69ff59cc5 (diff) | |
| download | ffmpeg-ae3313e1548641e3b4a61520e119729a8b61e061.tar.gz | |
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
vp8: K&R formatting cosmetics
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.h')
| -rw-r--r-- | libavcodec/vp8.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index ed88717c51..76c8a4401a 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -28,16 +28,17 @@ #include "libavutil/buffer.h" -#include "vp56.h" -#include "vp8dsp.h" #include "h264pred.h" #include "thread.h" +#include "vp56.h" +#include "vp8dsp.h" + #if HAVE_PTHREADS -#include <pthread.h> +# include <pthread.h> #elif HAVE_OS2THREADS -#include "compat/os2threads.h" +# include "compat/os2threads.h" #elif HAVE_W32THREADS -#include "compat/w32pthreads.h" +# include "compat/w32pthreads.h" #endif #define VP8_MAX_QUANT 127 @@ -84,7 +85,7 @@ typedef struct VP8FilterStrength { typedef struct VP8Macroblock { uint8_t skip; - // todo: make it possible to check for at least (i4x4 or split_mv) + // TODO: make it possible to check for at least (i4x4 or split_mv) // in one op. are others needed? uint8_t mode; uint8_t ref_frame; @@ -118,7 +119,7 @@ typedef struct VP8ThreadData { int thread_nr; #if HAVE_THREADS pthread_mutex_t lock; - pthread_cond_t cond; + pthread_cond_t cond; #endif int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF) int wait_mb_pos; // What the current thread is waiting on. @@ -205,7 +206,7 @@ typedef struct VP8Context { * [7] - split mv * i16x16 modes never have any adjustment */ - int8_t mode[VP8_MVMODE_SPLIT+1]; + int8_t mode[VP8_MVMODE_SPLIT + 1]; /** * filter strength adjustment for macroblocks that reference: @@ -217,7 +218,7 @@ typedef struct VP8Context { int8_t ref[4]; } lf_delta; - uint8_t (*top_border)[16+8+8]; + uint8_t (*top_border)[16 + 8 + 8]; uint8_t (*top_nnz)[9]; VP56RangeCoder c; ///< header context, includes mb modes and motion vectors @@ -236,7 +237,7 @@ typedef struct VP8Context { uint8_t golden; uint8_t pred16x16[4]; uint8_t pred8x8c[3]; - uint8_t token[4][16][3][NUM_DCT_TOKENS-1]; + uint8_t token[4][16][3][NUM_DCT_TOKENS - 1]; uint8_t mvc[2][19]; uint8_t scan[16]; } prob[2]; |