virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

ffv1: rename minor to micro version

Browse Source 
the version is 1.3.4 which makes 4 micro and not minor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-20 03:30:36 +02:00
parent 68b63a3432
commit d9b0b54a5f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1.h
View File

@ -83,7 +83,7 @@ typedef struct FFV1Context {
uint64_t rc_stat[256][2]; uint64_t rc_stat[256][2];
uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2]; uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2];
int version; int version;
int minor_version; int micro_version;
int width, height; int width, height;
int chroma_planes; int chroma_planes;
int chroma_h_shift, chroma_v_shift; int chroma_h_shift, chroma_v_shift;

8
libavcodec/ffv1dec.c
View File

@ -382,7 +382,7 @@ static int decode_slice(AVCodecContext *c, void *arg)
y = fs->slice_y; y = fs->slice_y;
if (!fs->ac) { 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 }); 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; fs->ac_byte_count = f->version > 2 || (!x && !y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
init_get_bits(&fs->gb, init_get_bits(&fs->gb,
@ -485,7 +485,7 @@ static int read_extra_header(FFV1Context *f)
f->version = get_symbol(c, state, 0); f->version = get_symbol(c, state, 0);
if (f->version > 2) { if (f->version > 2) {
c->bytestream_end -= 4; 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); f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
if (f->ac > 1) { if (f->ac > 1) {
@ -536,7 +536,7 @@ static int read_extra_header(FFV1Context *f)
if (f->version > 2) { if (f->version > 2) {
f->ec = get_symbol(c, state, 0); f->ec = get_symbol(c, state, 0);
if (f->minor_version > 2) if (f->micro_version > 2)
f->intra = get_symbol(c, state, 0); 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) if (f->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(f->avctx, AV_LOG_DEBUG, 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", "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->ac,
f->colorspace, f->colorspace,
f->avctx->bits_per_raw_sample, f->avctx->bits_per_raw_sample,

4
libavcodec/ffv1enc.c
View File

@ -537,8 +537,8 @@ static int write_extradata(FFV1Context *f)
put_symbol(c, state, f->version, 0); put_symbol(c, state, f->version, 0);
if (f->version > 2) { if (f->version > 2) {
if (f->version == 3) if (f->version == 3)
f->minor_version = 4; f->micro_version = 4;
put_symbol(c, state, f->minor_version, 0); put_symbol(c, state, f->micro_version, 0);
} }
put_symbol(c, state, f->ac, 0); put_symbol(c, state, f->ac, 0);