summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-24 04:53:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-25 03:43:21 +0200
commitad9371ef245e2f70f3a13b7f08c0ceeee02b831c (patch)
tree2cfad8286d8a136168025cef154ead65c70d4f1a /libavcodec/ffv1.c
parent6bcbe768bbc7ce615e2719fc491dad39af7c8d11 (diff)
ffv1enc: fix RC slice sentinel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 8043e960c5..5e74f178c7 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -815,8 +815,11 @@ static int write_extra_header(FFV1Context *f){
ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
put_symbol(c, state, f->version, 0);
- if(f->version > 2)
+ if(f->version > 2) {
+ if(f->version == 3)
+ f->minor_version = 1;
put_symbol(c, state, f->minor_version, 0);
+ }
put_symbol(c, state, f->ac, 0);
if(f->ac>1){
for(i=1; i<256; i++){
@@ -1321,7 +1324,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int bytes;
if(fs->ac){
- uint8_t state=128;
+ uint8_t state=129;
put_rac(&fs->c, &state, 0);
bytes= ff_rac_terminate(&fs->c);
}else{