diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:53:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:53:57 +0200 |
| commit | 04b0fd7e91b9a4f5e58744a61d8993bb7898b13b (patch) | |
| tree | 7bdca30124ee8815a3d18c2a9e5e176d714490b4 /libavcodec/h261.h | |
| parent | e7c801d9d319e3dcc354694499269796df0acdee (diff) | |
| parent | b78f81c8033904e2e75add0c9a603df6df514a30 (diff) | |
| download | ffmpeg-04b0fd7e91b9a4f5e58744a61d8993bb7898b13b.tar.gz | |
Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'
* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
h261: K&R formatting and prettyprinting cosmetics
Conflicts:
libavcodec/h261_parser.c
libavcodec/h261data.h
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261.h')
| -rw-r--r-- | libavcodec/h261.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h261.h b/libavcodec/h261.h index 001c663758..e673fdba1f 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -33,7 +33,7 @@ /** * H261Context */ -typedef struct H261Context{ +typedef struct H261Context { MpegEncContext s; int current_mba; @@ -44,11 +44,11 @@ typedef struct H261Context{ int current_mv_y; int gob_number; int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read -}H261Context; +} H261Context; #define MB_TYPE_H261_FIL 0x800000 -extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; +extern uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3]; void ff_h261_loop_filter(MpegEncContext *s); |