diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 02:54:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 03:06:20 +0200 |
| commit | f6777ce6fe7cefb027789c069ec14b394a874073 (patch) | |
| tree | 369b6378cc2ecd2c30644082205e5e8be0862bca /libavcodec/vc1.h | |
| parent | 5b134a0544ebfd129b087c3a2bb68a8847232322 (diff) | |
| parent | 1a02e78653a5c7674e6c43b6e6f2748dbd2091d7 (diff) | |
| download | ffmpeg-f6777ce6fe7cefb027789c069ec14b394a874073.tar.gz | |
Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'
* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
vc1: initialize color properties
See: ddabecbbf5509325c6c695ccc60d67c0af2065f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.h')
| -rw-r--r-- | libavcodec/vc1.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index a1b98e8337..eefb613ee8 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -203,6 +203,9 @@ typedef struct VC1Context{ int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present int refdist_flag; ///< REFDIST syntax element present in II, IP, PI or PP field picture headers int extended_dmv; ///< Additional extended dmv range at P/B frame-level + int color_prim; ///< 8bits, chroma coordinates of the color primaries + int transfer_char; ///< 8bits, Opto-electronic transfer characteristics + int matrix_coef; ///< 8bits, Color primaries->YCbCr transform matrix int hrd_param_flag; ///< Presence of Hypothetical Reference ///< Decoder parameters int psf; ///< Progressive Segmented Frame |