[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.163,1.164
Loren Merritt CVS
lorenm
Fri Nov 4 00:26:53 CET 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv25003
Modified Files:
h264.c
Log Message:
tidier cabac_intra4x4_pred_mode
Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- h264.c 28 Oct 2005 18:18:04 -0000 1.163
+++ h264.c 3 Nov 2005 23:26:51 -0000 1.164
@@ -5291,12 +5291,10 @@
if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
return pred_mode;
- if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
- mode += 1;
- if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
- mode += 2;
- if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
- mode += 4;
+ mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
+ mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
+ mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
+
if( mode >= pred_mode )
return mode + 1;
else
More information about the ffmpeg-cvslog
mailing list