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>

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 */