virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

Browse Source 
* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
  Rename tpel_template.c ---> pel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-13 19:03:47 +02:00
commit 684a9152c3
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264qpel_template.c
View File

@ -24,7 +24,7 @@
#include "bit_depth_template.c"
#include "hpel_template.c"
#include "tpel_template.c"
#include "pel_template.c"
static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
{

2
libavcodec/hpeldsp.c
View File

@ -33,7 +33,7 @@
#define BIT_DEPTH 8
#include "hpel_template.c"
#include "tpel_template.c"
#include "pel_template.c"
#define PIXOP2(OPNAME, OP) \
static inline void OPNAME ## _no_rnd_pixels8_l2_8(uint8_t *dst, \

6
libavcodec/tpel_template.c → libavcodec/pel_template.c
View File

@ -25,7 +25,7 @@
#include "bit_depth_template.c"
#define DEF_TPEL(OPNAME, OP) \
#define DEF_PEL(OPNAME, OP) \
static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, \
const uint8_t *pixels, \
ptrdiff_t line_size, \
@ -74,7 +74,7 @@ CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16), \
#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
#define op_put(a, b) a = b
DEF_TPEL(avg, op_avg)
DEF_TPEL(put, op_put)
DEF_PEL(avg, op_avg)
DEF_PEL(put, op_put)
#undef op_avg
#undef op_put

2
libavcodec/qpeldsp.c
View File

@ -36,7 +36,7 @@
#define BIT_DEPTH 8
#include "hpel_template.c"
#include "tpel_template.c"
#include "pel_template.c"
#include "qpel_template.c"
#define QPEL_MC(r, OPNAME, RND, OP) \

2
libavcodec/tpeldsp.c
View File

@ -29,7 +29,7 @@
#include "tpeldsp.h"
#define BIT_DEPTH 8
#include "tpel_template.c"
#include "pel_template.c"
static inline void put_tpel_pixels_mc00_c(uint8_t *dst, const uint8_t *src,
int stride, int width, int height)