diff options
author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:31:29 +0200 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:31:29 +0200 |
commit | 0ab1816315b01dae882a93db90e7f6709e6a71fd (patch) | |
tree | b92754ea02eb1f1f354a5ca63e9b6a170fe99232 /libavcodec/h264_mc_template.c | |
parent | dcdf69561fde475f2d99573174eb5ae54e3052de (diff) | |
parent | 56087ec0a29314d1860f6f0e6f40fbb9b40feccd (diff) | |
download | ffmpeg-0ab1816315b01dae882a93db90e7f6709e6a71fd.tar.gz |
Merge commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd'
* commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd':
h264: drop a pointless indirection
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264_mc_template.c')
-rw-r--r-- | libavcodec/h264_mc_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index bf8f0ad473..cd4a04e082 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -64,9 +64,9 @@ static void mc_part(const H264Context *h, H264SliceContext *sl, static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, - qpel_mc_func(*qpix_put)[16], + const qpel_mc_func(*qpix_put)[16], const h264_chroma_mc_func(*chroma_put), - qpel_mc_func(*qpix_avg)[16], + const qpel_mc_func(*qpix_avg)[16], const h264_chroma_mc_func(*chroma_avg), const h264_weight_func *weight_op, const h264_biweight_func *weight_avg) |