summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-04-04 14:34:38 +0200
committerDiego Biurrun <diego@biurrun.de>2013-04-05 12:25:12 +0200
commit52cd84d4d4e335daf26eb8c8b60c2578b3341b91 (patch)
tree5b32c0ef298e42a58c9b4c26fdf3122f9154957c
parent0404ec619d43f27b87c424aa1a572a6699fe6a31 (diff)
downloadffmpeg-streaming-52cd84d4d4e335daf26eb8c8b60c2578b3341b91.zip
ffmpeg-streaming-52cd84d4d4e335daf26eb8c8b60c2578b3341b91.tar.gz
h261: Move mvmap table to the only place it is used
-rw-r--r--libavcodec/h261data.h4
-rw-r--r--libavcodec/h261dec.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index bf0b209..eb5ee06 100644
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -92,10 +92,6 @@ static const uint8_t h261_mv_tab[17][2] = {
{ 11, 9 }, { 10, 9 }, { 9, 9 }, { 17, 10 }, { 16, 10 }, { 15, 10 }, { 14, 10 }, { 13, 10 }, { 12, 10 }
};
-static const int mvmap[17] = {
- 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
-};
-
// H.261 VLC table for coded block pattern
static const uint8_t h261_cbp_tab[63][2] = {
{ 11, 5 }, { 9, 5 }, { 13, 6 }, { 13, 4 }, { 23, 7 }, { 19, 7 }, { 31, 8 }, { 12, 4 },
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 4c31cf5..b13d779 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -222,6 +222,10 @@ 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)
{
int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);
OpenPOWER on IntegriCloud