generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-10-21 16:03:31 +02:00
parent 99ea47fe5a 2d09b36c03
commit aa760b1735
5 changed files with 187 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ffv1.h
View File

@@ -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);