[FFmpeg-cvslog] Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 14:50:47 2014 +0100| [0371eaebcd1bdcd94e4c9fccf23969c5f49bb5d0] | committer: Michael Niedermayer

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

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

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