[FFmpeg-soc] [soc]: r1487 - in rv40: rv30.c rv34.c rv34.h rv40.c
kostya
subversion at mplayerhq.hu
Sat Dec 1 12:12:22 CET 2007
Author: kostya
Date: Sat Dec 1 12:12:22 2007
New Revision: 1487
Log:
Change greek letter in function name
Modified:
rv40/rv30.c
rv40/rv34.c
rv40/rv34.h
rv40/rv40.c
Modified: rv40/rv30.c
==============================================================================
--- rv40/rv30.c (original)
+++ rv40/rv30.c Sat Dec 1 12:12:22 2007
@@ -71,7 +71,7 @@ static int rv30_decode_intra_types(RV34D
for(i = 0; i < 4; i++, dst += r->s.b4_stride){
ptr = dst;
for(j = 0; j < 4; j+= 2){
- code = (ff_rv34_get_omega(gb) - 1) << 1;
+ code = (ff_rv34_get_gamma(gb) - 1) << 1;
if(code >= 81*2){
av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n");
return -1;
@@ -101,7 +101,7 @@ static int rv30_decode_mb_info(RV34DecCo
GetBitContext *gb = &s->gb;
int code;
- code = ff_rv34_get_omega(gb) - 1;
+ code = ff_rv34_get_gamma(gb) - 1;
if(code > 11){
av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n");
return -1;
Modified: rv40/rv34.c
==============================================================================
--- rv40/rv34.c (original)
+++ rv40/rv34.c Sat Dec 1 12:12:22 2007
@@ -386,7 +386,7 @@ static inline RV34VLC* choose_vlc_set(in
/**
* Decode Levenstein (also known as Elias Gamma) code.
*/
-int ff_rv34_get_omega(GetBitContext *gb)
+int ff_rv34_get_gamma(GetBitContext *gb)
{
int code = 1;
@@ -399,11 +399,11 @@ int ff_rv34_get_omega(GetBitContext *gb)
/**
* Decode Levenstein (also known as Elias Gamma) code as signed integer.
*/
-int ff_rv34_get_omega_signed(GetBitContext *gb)
+int ff_rv34_get_gamma_signed(GetBitContext *gb)
{
int code;
- code = ff_rv34_get_omega(gb);
+ code = ff_rv34_get_gamma(gb);
if(code & 1)
return -(code >> 1);
else
@@ -872,8 +872,8 @@ static int rv34_decode_mv(RV34DecContext
memset(r->dmv, 0, sizeof(r->dmv));
for(i = 0; i < num_mvs[block_type]; i++){
- r->dmv[i][0] = ff_rv34_get_omega_signed(gb);
- r->dmv[i][1] = ff_rv34_get_omega_signed(gb);
+ r->dmv[i][0] = ff_rv34_get_gamma_signed(gb);
+ r->dmv[i][1] = ff_rv34_get_gamma_signed(gb);
}
switch(block_type){
case RV34_MB_TYPE_INTRA:
Modified: rv40/rv34.h
==============================================================================
--- rv40/rv34.h (original)
+++ rv40/rv34.h Sat Dec 1 12:12:22 2007
@@ -117,7 +117,7 @@ typedef struct RV34DecContext{
* common decoding functions
*/
int ff_rv34_get_start_offset(GetBitContext *gb, int blocks);
-int ff_rv34_get_omega(GetBitContext *gb);
+int ff_rv34_get_gamma(GetBitContext *gb);
int ff_rv34_decode_init(AVCodecContext *avctx);
int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size);
int ff_rv34_decode_end(AVCodecContext *avctx);
Modified: rv40/rv40.c
==============================================================================
--- rv40/rv40.c (original)
+++ rv40/rv40.c Sat Dec 1 12:12:22 2007
@@ -209,7 +209,7 @@ static int rv40_decode_mb_info(RV34DecCo
int count = 0;
if(!r->s.mb_skip_run)
- r->s.mb_skip_run = ff_rv34_get_omega(gb);
+ r->s.mb_skip_run = ff_rv34_get_gamma(gb);
if(--r->s.mb_skip_run)
return RV34_MB_SKIP;
More information about the FFmpeg-soc
mailing list