diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:26:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:26:43 +0200 |
| commit | 3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c (patch) | |
| tree | 5da0b2be09d434d1e2aa254448bdd2561d72e7b1 | |
| parent | cb20ca14a330ade01cb73c340976b86933e34c7d (diff) | |
| parent | 6d25c9db11e87ec58652de6588448225137b0c57 (diff) | |
| download | ffmpeg-3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c.tar.gz | |
Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'
* commit '6d25c9db11e87ec58652de6588448225137b0c57':
dsputil: Make square put/avg_pixels functions local to h264qpel
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dsputil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index e12b55580e..7fd9203704 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1329,19 +1329,19 @@ QPEL_MC(0, avg_ , _ , op_avg) void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - put_pixels8_8_c(dst, src, stride, 8); + put_pixels8_8_c(dst, src, stride, 8); } void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels8_8_c(dst, src, stride, 8); + avg_pixels8_8_c(dst, src, stride, 8); } void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - put_pixels16_8_c(dst, src, stride, 16); + put_pixels16_8_c(dst, src, stride, 16); } void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels16_8_c(dst, src, stride, 16); + avg_pixels16_8_c(dst, src, stride, 16); } #define put_qpel8_mc00_c ff_put_pixels8x8_c |