diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:13:55 +0200 |
| commit | aa760b1735907d256758ee67daa64f1e3b09bf0c (patch) | |
| tree | 2125e1e90ba68d853d732566d83c48a54999e93a /libavcodec/ffv1.h | |
| parent | 99ea47fe5a554126c2ddaccac42979e49d891aa4 (diff) | |
| parent | 2d09b36c0379fcda8f984bc8ad8816c8326fd7bd (diff) | |
| download | ffmpeg-streaming-aa760b1735907d256758ee67daa64f1e3b09bf0c.zip ffmpeg-streaming-aa760b1735907d256758ee67daa64f1e3b09bf0c.tar.gz | |
Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'
* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
doc/platform: Add info on shared builds with MSVC
doc/platform: Move a caveat down to the notes section
ARM: reinstate optimised intmath.h
ffv1: update to ffv1 version 3
Conflicts:
doc/platform.texi
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.h')
| -rw-r--r-- | libavcodec/ffv1.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index c16fdc4..e0e33f8 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -83,8 +83,8 @@ typedef struct FFV1Context { int version; int minor_version; int width, height; - int chroma_h_shift, chroma_v_shift; int chroma_planes; + int chroma_h_shift, chroma_v_shift; int transparency; int flags; int picture_number; @@ -102,12 +102,15 @@ typedef struct FFV1Context { int run_index; int colorspace; int16_t *sample_buffer; - int gob_count; - int packed_at_lsb; + int ec; int slice_damaged; int key_frame_ok; + int bits_per_raw_sample; + int packed_at_lsb; + + int gob_count; int quant_table_count; DSPContext dsp; @@ -120,7 +123,6 @@ typedef struct FFV1Context { int slice_height; int slice_x; int slice_y; - int bits_per_raw_sample; } FFV1Context; int ffv1_common_init(AVCodecContext *avctx); |
