summaryrefslogtreecommitdiff
path: root/libavcodec/vp8dsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-30 01:39:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-30 01:55:31 +0100
commitae3313e1548641e3b4a61520e119729a8b61e061 (patch)
treec02a97bdede1293f5b180ebfa1ac089cdf8ab8fb /libavcodec/vp8dsp.h
parentaf3b6aed0da5e292897b3be099c3cc7a3a44e2c4 (diff)
parent53c20f17c78d1d8a0fc2505868f201e69ff59cc5 (diff)
downloadffmpeg-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/vp8dsp.h')
-rw-r--r--libavcodec/vp8dsp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h
index 02ac77802a..cf73076caf 100644
--- a/libavcodec/vp8dsp.h
+++ b/libavcodec/vp8dsp.h
@@ -30,8 +30,8 @@
#include <stddef.h>
#include <stdint.h>
-typedef void (*vp8_mc_func)(uint8_t *dst/*align 8*/, ptrdiff_t dstStride,
- uint8_t *src/*align 1*/, ptrdiff_t srcStride,
+typedef void (*vp8_mc_func)(uint8_t *dst /* align 8 */, ptrdiff_t dstStride,
+ uint8_t *src /* align 1 */, ptrdiff_t srcStride,
int h, int x, int y);
typedef struct VP8DSPContext {