diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 03:30:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 03:30:36 +0200 |
| commit | d9b0b54a5f8bcd7f8fb01d6d008d3798a20dc43b (patch) | |
| tree | b52d6633a37428ba478f4a3a98f1f9c2d194de53 /libavcodec/ffv1dec.c | |
| parent | 68b63a3432016756a4a47396a8c522ad0c217e29 (diff) | |
ffv1: rename minor to micro version
the version is 1.3.4 which makes 4 micro and not minor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
| -rw-r--r-- | libavcodec/ffv1dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index e5aac29abc..658c71745f 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -382,7 +382,7 @@ static int decode_slice(AVCodecContext *c, void *arg) y = fs->slice_y; if (!fs->ac) { - if (f->version == 3 && f->minor_version > 1 || f->version > 3) + if (f->version == 3 && f->micro_version > 1 || f->version > 3) get_rac(&fs->c, (uint8_t[]) { 129 }); fs->ac_byte_count = f->version > 2 || (!x && !y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0; init_get_bits(&fs->gb, @@ -485,7 +485,7 @@ static int read_extra_header(FFV1Context *f) f->version = get_symbol(c, state, 0); if (f->version > 2) { c->bytestream_end -= 4; - f->minor_version = get_symbol(c, state, 0); + f->micro_version = get_symbol(c, state, 0); } f->ac = f->avctx->coder_type = get_symbol(c, state, 0); if (f->ac > 1) { @@ -536,7 +536,7 @@ static int read_extra_header(FFV1Context *f) if (f->version > 2) { f->ec = get_symbol(c, state, 0); - if (f->minor_version > 2) + if (f->micro_version > 2) f->intra = get_symbol(c, state, 0); } @@ -553,7 +553,7 @@ static int read_extra_header(FFV1Context *f) if (f->avctx->debug & FF_DEBUG_PICT_INFO) av_log(f->avctx, AV_LOG_DEBUG, "global: ver:%d.%d, coder:%d, colorspace: %d bpr:%d chroma:%d(%d:%d), alpha:%d slices:%dx%d qtabs:%d ec:%d intra:%d\n", - f->version, f->minor_version, + f->version, f->micro_version, f->ac, f->colorspace, f->avctx->bits_per_raw_sample, |