[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 18:29:22 2013 +0100| [d5d29ae3b0375320a7a34f85a5a90e8362550dbb] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5d29ae3b0375320a7a34f85a5a90e8362550dbb
---