Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 20:09:10 +0000 (22:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 20:09:10 +0000 (22:09 +0200)
* qatar/master:
  h261: Move mvmap table to the only place it is used

Conflicts:
libavcodec/h261data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h261dec.c

Simple merge