summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@via.ecp.fr>2004-03-26 19:35:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-03-26 19:35:53 +0000
commite5017ab8701c7ac3edc74fd1c1ae45b414e8eda1 (patch)
treed7c342fc57697214da16dd9b7af0c08240235f33 /libavcodec/ffv1.c
parent6fb316d5634252e259b3c95dcc40de533173cb1c (diff)
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 2932 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index fb2aaa7371..eefce93705 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -650,6 +650,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
ff_init_cabac_encoder(c, buf, buf_size);
ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
+ c->lps_state[2] = 1;
+ c->lps_state[3] = 0;
*p = *pict;
p->pict_type= FF_I_TYPE;
@@ -954,6 +956,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
ff_init_cabac_decoder(c, buf, buf_size);
ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
+ c->lps_state[2] = 1;
+ c->lps_state[3] = 0;
+
p->pict_type= FF_I_TYPE; //FIXME I vs. P
if(get_cabac_bypass(c)){