diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:21:37 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:27:53 +0100 |
| commit | ba5bcf96124a4933eef170dfe7955809d8d54a64 (patch) | |
| tree | d3176392bc39e7e31809a63a6f9b2872896da00c /libavcodec/intrax8.h | |
| parent | 7120bff0a32682c568981cb645a6d15a2b532ee0 (diff) | |
| parent | 2ade1cdafb96bf47e77f7ed74731d78a30aae950 (diff) | |
| download | ffmpeg-ba5bcf96124a4933eef170dfe7955809d8d54a64.tar.gz | |
Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'
* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950':
intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 9981785403..8792996822 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -25,27 +25,31 @@ #include "wmv2dsp.h" typedef struct IntraX8Context { - VLC * j_ac_vlc[4];//they point to the static j_mb_vlc - VLC * j_orient_vlc; - VLC * j_dc_vlc[3]; + VLC *j_ac_vlc[4]; // they point to the static j_mb_vlc + VLC *j_orient_vlc; + VLC *j_dc_vlc[3]; int use_quant_matrix; -//set by ff_intrax8_common_init - uint8_t * prediction_table;//2*(mb_w*2) + + // set by ff_intrax8_common_init + uint8_t *prediction_table; // 2 * (mb_w * 2) ScanTable scantable[3]; WMV2DSPContext wdsp; uint8_t idct_permutation[64]; -//set by the caller codec + + //set by the caller codec MpegEncContext * s; IntraX8DSPContext dsp; int quant; int dquant; int qsum; -//calculated per frame + + // calculated per frame int quant_dc_chroma; int divide_quant_dc_luma; int divide_quant_dc_chroma; -//changed per block + + // changed per block int edges; int flat_dc; int predicted_dc; @@ -55,8 +59,8 @@ typedef struct IntraX8Context { int est_run; } IntraX8Context; -void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s); -void ff_intrax8_common_end(IntraX8Context * w); -int ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq); +void ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s); +void ff_intrax8_common_end(IntraX8Context *w); +int ff_intrax8_decode_picture(IntraX8Context *w, int quant, int halfpq); #endif /* AVCODEC_INTRAX8_H */ |