diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 21:57:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 21:57:46 +0200 |
| commit | 4c731233338d2bc6d9646808b7599224450932c6 (patch) | |
| tree | 7c8ba788012e320ba274db88e8fa4b099d7ccdb3 /libavcodec/asv.h | |
| parent | 50c6bffb67d140bcf4b28d0b4495648b9f6b07f9 (diff) | |
| parent | f61e47dd68582529bcf6d42d861c70a320cd1b67 (diff) | |
Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'
* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
asv: K&R formatting cosmetics
Conflicts:
libavcodec/asvdec.c
libavcodec/asvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index a0e8fef703..e2cdc81300 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -39,7 +39,7 @@ #include "pixblockdsp.h" #include "put_bits.h" -typedef struct ASV1Context{ +typedef struct ASV1Context { AVCodecContext *avctx; BlockDSPContext bdsp; BswapDSPContext bbdsp; |