diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 16:55:56 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 16:57:43 +0000 |
| commit | bba2488f074904069e38865654413ec44d35ec24 (patch) | |
| tree | e9a6a7ec8dc52da3901726389f9e7fbb7abf58ce /libavcodec/ffv1.c | |
| parent | 3c110b009b8efd3650f1b8caf31c331ee775f0ee (diff) | |
| parent | 4bb1070c154e49d35805fbcdac9c9e92f702ef96 (diff) | |
| download | ffmpeg-bba2488f074904069e38865654413ec44d35ec24.tar.gz | |
Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'
* commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96':
ffv1: Explicitly name the coder type
Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index dafc7f45f2..537409e4ed 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -73,7 +73,7 @@ av_cold int ff_ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs) for (j = 0; j < f->plane_count; j++) { PlaneContext *const p = &fs->plane[j]; - if (fs->ac) { + if (fs->ac != AC_GOLOMB_RICE) { if (!p->state) p->state = av_malloc_array(p->context_count, CONTEXT_SIZE * sizeof(uint8_t)); @@ -92,7 +92,7 @@ av_cold int ff_ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs) } } - if (fs->ac > 1) { + if (fs->ac == AC_RANGE_CUSTOM_TAB) { //FIXME only redo if state_transition changed for (j = 1; j < 256; j++) { fs->c. one_state[ j] = f->state_transition[j]; @@ -184,7 +184,7 @@ void ff_ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs) p->interlace_bit_state[0] = 128; p->interlace_bit_state[1] = 128; - if (fs->ac) { + if (fs->ac != AC_GOLOMB_RICE) { if (f->initial_states[p->quant_table_index]) { memcpy(p->state, f->initial_states[p->quant_table_index], CONTEXT_SIZE * p->context_count); |