diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
| commit | b20fe650ef856006b50bbd767a39e19a8a6319f8 (patch) | |
| tree | 12b60fd9a8960a113e30a566b54c2b3f9e43738c /libavcodec/golomb.h | |
| parent | 324f0fbff1245f9e9e1dda29ecb03138a2de287d (diff) | |
| parent | 4024b566d664a4b161d677554be52f32e7ad4236 (diff) | |
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/golomb.h')
| -rw-r--r-- | libavcodec/golomb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 0d2af4b6aa..917ea54e14 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -112,7 +112,7 @@ static inline int get_ue_golomb_31(GetBitContext *gb) return ff_ue_golomb_vlc_code[buf]; } -static inline unsigned svq3_get_ue_golomb(GetBitContext *gb) +static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb) { uint32_t buf; @@ -219,7 +219,7 @@ static inline int get_se_golomb_long(GetBitContext *gb) return ((buf >> 1) ^ sign) + 1; } -static inline int svq3_get_se_golomb(GetBitContext *gb) +static inline int get_interleaved_se_golomb(GetBitContext *gb) { unsigned int buf; @@ -254,7 +254,7 @@ static inline int svq3_get_se_golomb(GetBitContext *gb) static inline int dirac_get_se_golomb(GetBitContext *gb) { - uint32_t ret = svq3_get_ue_golomb(gb); + uint32_t ret = get_interleaved_ue_golomb(gb); if (ret) { int sign = -get_bits1(gb); |