diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-01-27 21:59:14 +0100 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-01-28 09:25:59 +0100 |
| commit | 27f1ea5097da5aa3a3bffdc5f06e915a89f51c6a (patch) | |
| tree | d526d8f857b2c06303b23a17dc5283a211c91d82 /libavcodec/mjpegdec.c | |
| parent | e0b187e7dada3a412c942d2e07f6caed8614b8ef (diff) | |
| download | ffmpeg-27f1ea5097da5aa3a3bffdc5f06e915a89f51c6a.tar.gz | |
lavc/mjpegdec: use ptrdiff_t instead of ssize_t
Fixes build on msvc.
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0aedc9dae7..69c9cf3626 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1925,7 +1925,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s, uint8_t *dst = s->buffer; #define copy_data_segment(skip) do { \ - ssize_t length = (ptr - src) - (skip); \ + ptrdiff_t length = (ptr - src) - (skip); \ if (length > 0) { \ memcpy(dst, src, length); \ dst += length; \ @@ -1941,7 +1941,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s, uint8_t x = *(ptr++); if (x == 0xff) { - ssize_t skip = 0; + ptrdiff_t skip = 0; while (ptr < buf_end && x == 0xff) { x = *(ptr++); skip++; |