Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 17:29:22 +0000 (18:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 21:03:27 +0000 (22:03 +0100)
* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

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

Simple merge