diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:54:26 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:57:04 +0000 |
| commit | 5b0d4c247a3c3ba8a8ece70b31354121645c8320 (patch) | |
| tree | 9fe83a0d04bff7be533c99a6774c3ecfd529e50c /libavcodec/ffv1.h | |
| parent | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (diff) | |
| parent | 96c373c7704aeb1cc1d2c275fbb5d71777665589 (diff) | |
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
lavc: Move context_model to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/ffv1.h')
| -rw-r--r-- | libavcodec/ffv1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 7cb97f4f58..d9398e55c7 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -114,6 +114,7 @@ typedef struct FFV1Context { int intra; int slice_damaged; int key_frame_ok; + int context_model; int bits_per_raw_sample; int packed_at_lsb; |