summaryrefslogtreecommitdiffstats
path: root/media/ffvpx/libavcodec/h264dsp.h
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-02-06 12:03:37 +0100
committerGitHub <noreply@github.com>2018-02-06 12:03:37 +0100
commit5cc30e0f603a030b97b7be37a7aa5d22d13f7a07 (patch)
tree01875b465e2f7749cc8f87f1df756b2cb2ca2596 /media/ffvpx/libavcodec/h264dsp.h
parent389c60da5e01761f4a11ef539ffa26e4c1b17875 (diff)
parent30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (diff)
downloadUXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar
UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.gz
UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.lz
UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.xz
UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.zip
Merge pull request #10 from trav90/media-work
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/h264dsp.h')
-rw-r--r--media/ffvpx/libavcodec/h264dsp.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/ffvpx/libavcodec/h264dsp.h b/media/ffvpx/libavcodec/h264dsp.h
index 7f24376b8..bcd76abcc 100644
--- a/media/ffvpx/libavcodec/h264dsp.h
+++ b/media/ffvpx/libavcodec/h264dsp.h
@@ -28,11 +28,12 @@
#define AVCODEC_H264DSP_H
#include <stdint.h>
+#include <stddef.h>
-typedef void (*h264_weight_func)(uint8_t *block, int stride, int height,
+typedef void (*h264_weight_func)(uint8_t *block, ptrdiff_t stride, int height,
int log2_denom, int weight, int offset);
typedef void (*h264_biweight_func)(uint8_t *dst, uint8_t *src,
- int stride, int height, int log2_denom,
+ ptrdiff_t stride, int height, int log2_denom,
int weightd, int weights, int offset);
/**