diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-09-27 20:13:59 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 11:28:09 +0200 |
| commit | c341f734e5f9d6af4a8fdcceb6f5d12de6395c76 (patch) | |
| tree | 42c66699b2e6685e3c4ab67d32a6d0dec7a6e2be /libavcodec/h264.h | |
| parent | 7381d31f2267489ed5e939707b7e77a20adc168d (diff) | |
| download | ffmpeg-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.tar.gz | |
Convert multiplier for MV from int to ptrdiff_t.
This prevents emulated_edge_mc from not undoing mvy*stride-related
integer overflows.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b2365bce83..f1db519e47 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -306,7 +306,7 @@ typedef struct H264Context { /* coded dimensions -- 16 * mb w/h */ int width, height; - int linesize, uvlinesize; + ptrdiff_t linesize, uvlinesize; int chroma_x_shift, chroma_y_shift; int qscale; @@ -379,8 +379,8 @@ typedef struct H264Context { uint32_t *mb2br_xy; int b_stride; // FIXME use s->b4_stride - int mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff - int mb_uvlinesize; + ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff + ptrdiff_t mb_uvlinesize; unsigned current_sps_id; ///< id of the current SPS SPS sps; ///< current sps |