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)
* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   * 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;
Simple merge
Simple merge
Simple merge
Simple merge
   * 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
Simple merge