diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 22:09:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 22:09:10 +0200 |
| commit | 37f080f6f6a8d757271f946be03408731527a8a5 (patch) | |
| tree | e3a5344773e108be532caca73b2c559d477b33c3 | |
| parent | 473d1297427fff8cd00b08ce054e80a262efc6eb (diff) | |
| parent | 52cd84d4d4e335daf26eb8c8b60c2578b3341b91 (diff) | |
| download | ffmpeg-37f080f6f6a8d757271f946be03408731527a8a5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h261: Move mvmap table to the only place it is used
Conflicts:
libavcodec/h261data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h261dec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 47fbebe973..9646967d49 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -223,11 +223,12 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2) return 0; } +static const int mvmap[17] = { + 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16 +}; + static int decode_mv_component(GetBitContext *gb, int v) { - static const int mvmap[17] = { - 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16 - }; int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2); /* check if mv_diff is valid */ |