[FFmpeg-cvslog] Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  6 13:33:01 2013 +0200| [86ca6a7568498f1975f37a5b030261794c824945] | committer: Michael Niedermayer

Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'

* commit '97b052e56807fab6887e9ba210a28a622e6a4b78':
  avisynth: Add missing #include for NULL_IF_CONFIG_SMALL

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

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