diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 13:47:29 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 15:58:32 +0100 |
| commit | e07fa3008bcafc027e9aa654657bae1f1ac64f5d (patch) | |
| tree | fdc9dc3b4e4565b2a7b4a27a0ccbe77ab65e22b0 /libavcodec/dvenc.c | |
| parent | ce818d90bdb28d8591e6b81e020d1e7f87536649 (diff) | |
| parent | de452e503734ebb0fdbce86e9d16693b3530fad3 (diff) | |
| download | ffmpeg-e07fa3008bcafc027e9aa654657bae1f1ac64f5d.tar.gz | |
Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'
* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
pixblockdsp: Change type of stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index a27b9ef0da..e3de18a510 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -204,7 +204,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; @@ -241,8 +241,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; @@ -420,7 +420,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]); |