Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

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

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

diff --cc libavcodec/ac3enc_template.c
Simple merge

diff --cc libavcodec/h264_mb_template.c
Simple merge

diff --cc libavcodec/h264_mc_template.c
Simple merge

diff --cc libavcodec/h264idct_template.c
Simple merge

diff --cc libavcodec/hpel_template.c
Simple merge

diff --cc libavcodec/motion_est_template.c
Simple merge

diff --cc libavcodec/simple_idct_template.c
Simple merge

diff --cc libavcodec/videodsp_template.c
index c569c30d6075421842fe68a1f9550652099d4e41,28b8c3286d4d001f7470bbbb54e081f70970a08c..f4ff2ba64695d9288ce58a56f744aa2c1694025b
--- 1/libavcodec/videodsp_template.c
--- 2/libavcodec/videodsp_template.c
+++ b/libavcodec/videodsp_template.c
@@@ -19,12 -19,15 +19,14 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
+ #include <assert.h>
+ 
  #include "bit_depth_template.c"
 -
 -static void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
 -                                      ptrdiff_t buf_linesize,
 -                                      ptrdiff_t src_linesize,
 -                                      int block_w, int block_h,
 -                                      int src_x, int src_y, int w, int h)
 +void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
 +                               ptrdiff_t buf_linesize,
 +                               ptrdiff_t src_linesize,
 +                               int block_w, int block_h,
 +                               int src_x, int src_y, int w, int h)
  {
      int x, y;
      int start_y, start_x, end_y, end_x;

diff --cc libavcodec/x86/dsputil_qns_template.c
Simple merge

diff --cc libavcodec/x86/hpeldsp_rnd_template.c
Simple merge

diff --cc libavcodec/x86/mpegvideoenc_template.c
Simple merge

diff --cc libavresample/resample_template.c
Simple merge

diff --cc libswscale/x86/rgb2rgb_template.c
Simple merge

diff --cc libswscale/x86/swscale_template.c
index 71a60bc73880a62a92fc3d0f329d8b6f49339381,1e42ec5b12124c0e7050ad0df61b07f4f8c83c2a..67957ac4d46d9ed063d43808cf0a9686616092e8
--- 1/libswscale/x86/swscale_template.c
--- 2/libswscale/x86/swscale_template.c
+++ b/libswscale/x86/swscale_template.c
@@@ -18,9 -18,13 +18,14 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
+ #include <stdint.h>
+ 
+ #include "libavutil/x86/asm.h"
+ #include "libswscale/swscale_internal.h"
+ 
  #undef REAL_MOVNTQ
  #undef MOVNTQ
 +#undef MOVNTQ2
  #undef PREFETCH
  
  #if COMPILE_TEMPLATE_MMXEXT

diff --cc libswscale/x86/yuv2rgb_template.c
Simple merge