diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 15:23:05 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 15:45:08 +0400 |
commit | 55c49afc42abae64e5ab25e04bc3c09b17c5b6d5 (patch) | |
tree | 3e56007e0d3039ee6aa91e0e87b9abc14a49bf94 /libavcodec/ivi_common.h | |
parent | 886c3662d308e97316a606732574f0e87b1cbe3a (diff) | |
parent | d3a72becc6371563185a509b94f5daf32ddbb485 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: return proper error codes.
Give all anonymously typedeffed structs in headers a name
fate: Add parseutils test
parseutils-test: Drop random colors from parsing test
vf_pad/scale: use double precision for aspect ratios.
build: error on variable-length arrays
ppc: swscale: rework yuv2planeX_altivec()
ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
x86: dsputil: kill VLA in gmc_mmx()
libspeexenc: Updated commentary to reflect recent changes
libspeexenc: Add an option for enabling DTX
doc/APIchanges: fill in missing dates and hashes.
lavr: bump major to 1 and declare it stable.
lavr: change the type of the data buffers to uint8_t**.
lavc: deprecate the audio resampling API.
Conflicts:
cmdutils.h
configure
doc/APIchanges
ffplay.c
libavcodec/dwt.h
libavcodec/libspeexenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/asf.h
tests/fate/libavutil.mak
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.h')
-rw-r--r-- | libavcodec/ivi_common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 4636f6ce52..44b28cd231 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -40,7 +40,7 @@ /** * huffman codebook descriptor */ -typedef struct { +typedef struct IVIHuffDesc { int32_t num_rows; uint8_t xbits[16]; } IVIHuffDesc; @@ -48,7 +48,7 @@ typedef struct { /** * macroblock/block huffman table descriptor */ -typedef struct { +typedef struct IVIHuffTab { int32_t tab_sel; /// index of one of the predefined tables /// or "7" for custom one VLC *tab; /// pointer to the table associated with tab_sel @@ -85,7 +85,7 @@ typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch, /** * run-value (RLE) table descriptor */ -typedef struct { +typedef struct RVMapDesc { uint8_t eob_sym; ///< end of block symbol uint8_t esc_sym; ///< escape symbol uint8_t runtab[256]; @@ -98,7 +98,7 @@ extern const RVMapDesc ff_ivi_rvmap_tabs[9]; /** * information for Indeo macroblock (16x16, 8x8 or 4x4) */ -typedef struct { +typedef struct IVIMbInfo { int16_t xpos; int16_t ypos; uint32_t buf_offs; ///< address in the output buffer for this mb @@ -113,7 +113,7 @@ typedef struct { /** * information for Indeo tile */ -typedef struct { +typedef struct IVITile { int xpos; int ypos; int width; @@ -130,7 +130,7 @@ typedef struct { /** * information for Indeo wavelet band */ -typedef struct { +typedef struct IVIBandDesc { int plane; ///< plane number this band belongs to int band_num; ///< band number int width; @@ -178,7 +178,7 @@ typedef struct { /** * color plane (luma or chroma) information */ -typedef struct { +typedef struct IVIPlaneDesc { uint16_t width; uint16_t height; uint8_t num_bands; ///< number of bands this plane subdivided into @@ -186,7 +186,7 @@ typedef struct { } IVIPlaneDesc; -typedef struct { +typedef struct IVIPicConfig { uint16_t pic_width; uint16_t pic_height; uint16_t chroma_width; |