aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp8.h
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-03-28 01:13:54 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-29 16:11:09 +0100
commit53c20f17c78d1d8a0fc2505868f201e69ff59cc5 (patch)
tree7d543871ede0f0adf63d3c5fcaef907275e42758 /libavcodec/vp8.h
parent6adf3bc42e36242d487636786e995149bbb849fe (diff)
downloadffmpeg-53c20f17c78d1d8a0fc2505868f201e69ff59cc5.tar.gz
vp8: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/vp8.h')
-rw-r--r--libavcodec/vp8.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 6d864b9a7f..1eb0512626 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -28,14 +28,15 @@
#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_W32THREADS
-#include "compat/w32pthreads.h"
+# include "compat/w32pthreads.h"
#endif
#define VP8_MAX_QUANT 127
@@ -82,7 +83,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;
@@ -116,7 +117,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.
@@ -203,7 +204,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:
@@ -215,7 +216,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
@@ -234,7 +235,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];
} prob[2];