diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:13:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:13:37 +0200 |
| commit | feac9cbed0602503e9100dd2257ddc0d46e1929d (patch) | |
| tree | 44eff3a2070ec8642c071e7a5d34472466b46a64 /libavcodec/wmv2.h | |
| parent | 5b58d79a99658200ee5562999b16b5a8fa729b22 (diff) | |
| parent | eda7571ea1a41c835e3a02fa9517e5bc67d7adce (diff) | |
| download | ffmpeg-feac9cbed0602503e9100dd2257ddc0d46e1929d.tar.gz | |
Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
wmv2: K&R formatting cosmetics
Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.h')
| -rw-r--r-- | libavcodec/wmv2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index 52739c1f9c..cb5b14e219 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -22,8 +22,8 @@ #define AVCODEC_WMV2_H #include "avcodec.h" -#include "mpegvideo.h" #include "intrax8.h" +#include "mpegvideo.h" #include "wmv2dsp.h" #define SKIP_TYPE_NONE 0 @@ -32,7 +32,7 @@ #define SKIP_TYPE_COL 3 -typedef struct Wmv2Context{ +typedef struct Wmv2Context { MpegEncContext s; IntraX8Context x8; WMV2DSPContext wdsp; @@ -52,8 +52,8 @@ typedef struct Wmv2Context{ ScanTable abt_scantable[2]; DECLARE_ALIGNED(16, int16_t, abt_block2)[6][64]; -}Wmv2Context; +} Wmv2Context; -void ff_wmv2_common_init(Wmv2Context * w); +void ff_wmv2_common_init(Wmv2Context *w); #endif /* AVCODEC_WMV2_H */ |