diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:37 +0400 |
| commit | 10c6d1b28cbd0f39915649940821184d8278eaea (patch) | |
| tree | 6ac53e4fe6e0c23f72033ecfb2280895f653cfda /libavcodec/h264.h | |
| parent | f7f74a37b82d7905e49aeb8beed02a9966f15ef6 (diff) | |
| parent | 93f305473f880729d18b5e42067f19d2106cb2e5 (diff) | |
Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 4324bd314e..ed7f04b853 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -379,7 +379,7 @@ typedef struct H264Context { uint32_t *mb2br_xy; int b_stride; // FIXME use s->b4_stride - ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff + 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 |