diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:43:58 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:58 +0200 |
| commit | 35e02a3d0e49522d2810df76dab8cdac76ef804f (patch) | |
| tree | 9b57b7343008580486758621e2b47ba3f8aea8ba /libavcodec/snowdata.h | |
| parent | d6c8dcb8ac0b844f24a07168022dead5e5ff9b91 (diff) | |
| download | ffmpeg-35e02a3d0e49522d2810df76dab8cdac76ef804f.tar.gz | |
snow: Add ff_ prefix to nonstatic symbols
This allows getting rid of a hack for conflicting symbol/define
names.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/snowdata.h')
| -rw-r--r-- | libavcodec/snowdata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/snowdata.h b/libavcodec/snowdata.h index ca2468c091..4a91858402 100644 --- a/libavcodec/snowdata.h +++ b/libavcodec/snowdata.h @@ -101,7 +101,7 @@ static const uint8_t obmc4[16]={ //error:0.000000 }; -const int8_t quant3bA[256]={ +const int8_t ff_quant3bA[256]={ 0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, @@ -120,13 +120,13 @@ const int8_t quant3bA[256]={ 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, }; -const uint8_t * const obmc_tab[4]= { +const uint8_t * const ff_obmc_tab[4]= { obmc32, obmc16, obmc8, obmc4 }; /* runtime generated tables */ -uint8_t qexp[QROOT]; -int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES]; +uint8_t ff_qexp[QROOT]; +int ff_scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES]; #endif /* AVCODEC_SNOW_H */ |