Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-09-06 17:06:12 +0300
committerDiego Biurrun <diego@biurrun.de>2016-09-14 15:12:36 +0300
commitde452e503734ebb0fdbce86e9d16693b3530fad3 (patch)
tree4a8055e1c5158b8d51c4f17b99c4befe9d45a19d /libavcodec/dvenc.c
parentab3554e1a7c04a5ea30f9c905de92348478ef7c8 (diff)
pixblockdsp: Change type of stride parameters to ptrdiff_t
This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic. Also adjust parameter names to be "stride" everywhere.
Diffstat (limited to 'libavcodec/dvenc.c')
-rw-r--r--libavcodec/dvenc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index e02f349fbc..399c4341f8 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -197,7 +197,7 @@ static av_always_inline PutBitContext *dv_encode_ac(EncBlockInfo *bi,
}
static av_always_inline int dv_guess_dct_mode(DVVideoContext *s, uint8_t *data,
- int linesize)
+ ptrdiff_t linesize)
{
if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
int ps = s->ildct_cmp(NULL, data, NULL, linesize, 8) - 400;
@@ -234,8 +234,8 @@ static const int dv_weight_248[64] = {
};
static av_always_inline int dv_init_enc_block(EncBlockInfo *bi, uint8_t *data,
- int linesize, DVVideoContext *s,
- int bias)
+ ptrdiff_t linesize,
+ DVVideoContext *s, int bias)
{
const int *weight;
const uint8_t *zigzag_scan;
@@ -413,7 +413,8 @@ static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
DVVideoContext *s = avctx->priv_data;
DVwork_chunk *work_chunk = arg;
int mb_index, i, j;
- int mb_x, mb_y, c_offset, linesize, y_stride;
+ int mb_x, mb_y, c_offset;
+ ptrdiff_t linesize, y_stride;
uint8_t *y_ptr;
uint8_t *dif;
LOCAL_ALIGNED_8(uint8_t, scratch, [128]);