[FFmpeg-cvslog] r10642 - in trunk/libavcodec: cabac.h ppc/dsputil_altivec.c
Guillaume Poirier
gpoirier
Tue Oct 2 14:55:22 CEST 2007
Hi,
diego wrote:
> Author: diego
> Date: Tue Oct 2 14:34:43 2007
> New Revision: 10642
>
> Log:
> Replace CONFIG_VORBIS_DECODER #ifdef by if (ENABLE_VORBIS_DECODER).
> Blessed by Luca Barbato on IRC.
>
>
> Modified:
> trunk/libavcodec/cabac.h
> trunk/libavcodec/ppc/dsputil_altivec.c
>
> Modified: trunk/libavcodec/cabac.h
> ==============================================================================
> --- trunk/libavcodec/cabac.h (original)
> +++ trunk/libavcodec/cabac.h Tue Oct 2 14:34:43 2007
> @@ -90,6 +90,7 @@ static inline void renorm_cabac_encoder(
> }
> }
>
> +#if 0
> static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
> int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
>
> @@ -259,6 +260,7 @@ static void put_cabac_ueg(CABACContext *
> put_cabac_bypass(c, sign);
> }
> }
> +#endif /* 0 */
>
> static void refill(CABACContext *c){
> #if CABAC_BITS == 16
> @@ -270,6 +272,7 @@ static void refill(CABACContext *c){
> c->bytestream+= CABAC_BITS/8;
> }
>
> +#if 0
> static void refill2(CABACContext *c){
> int i, x;
>
> @@ -287,6 +290,7 @@ static void refill2(CABACContext *c){
> c->low += x<<i;
> c->bytestream+= CABAC_BITS/8;
> }
> +#endif
>
> static inline void renorm_cabac_decoder(CABACContext *c){
> while(c->range < 0x100){
> @@ -860,5 +864,6 @@ static int get_cabac_ueg(CABACContext *c
> }else
> return i;
> }
> +#endif /* 0 */
>
> #endif /* CABAC_H */
Mmm... These changes don't match your commit msg, and are stepping on
Michael's territory... I have a hunch that this was committed by mistake.
Did you read the diff before committing ;-)
Guillaume
More information about the ffmpeg-cvslog
mailing list