eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

Browse Source 
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
  qpeldsp: Mark source pointer in qpel_mc_func function pointer const

Conflicts:
	libavcodec/h264qpel_template.c
	libavcodec/x86/cavsdsp.c
	libavcodec/x86/rv40dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-25 12:58:03 +02:00
parent 937eaba2a1 7fb993d338
commit 2904d052b7
15 changed files with 460 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/arm/rv40dsp_init_arm.c
View File

@@ -26,8 +26,10 @@
#include "libavutil/arm/cpu.h"
#define DECL_QPEL3(type, w, pos) \
void ff_##type##_rv40_qpel##w##_mc##pos##_neon(uint8_t *dst, uint8_t *src,\
ptrdiff_t stride)
void ff_ ## type ## _rv40_qpel ## w ## _mc ## pos ## _neon(uint8_t *dst, \
const uint8_t *src, \
ptrdiff_t stride)
#define DECL_QPEL2(w, pos) \
DECL_QPEL3(put, w, pos); \
DECL_QPEL3(avg, w, pos)