Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:50:47 +0000 (14:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:50:55 +0000 (14:50 +0100)
commit0371eaebcd1bdcd94e4c9fccf23969c5f49bb5d0
tree5ceb11ab82b3c988429607bf63300c636f1d5dc5
parent32620691011186a0a3932bba8ddb078ce5312f22
parentaba70bb5387f12dfa5e6cd8cb861c9c7e668151f
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
libavcodec/ac3enc_template.c
libavcodec/h264_mb_template.c
libavcodec/h264_mc_template.c
libavcodec/h264idct_template.c
libavcodec/hpel_template.c
libavcodec/motion_est_template.c
libavcodec/simple_idct_template.c
libavcodec/videodsp_template.c
libavcodec/x86/dsputil_qns_template.c
libavcodec/x86/hpeldsp_rnd_template.c
libavcodec/x86/mpegvideoenc_template.c
libavresample/resample_template.c
libswscale/x86/rgb2rgb_template.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb_template.c