diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 01:23:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 01:23:19 +0100 |
| commit | 4f927542fbf6ae98301a7a97e0ca41fa1ba3b04b (patch) | |
| tree | c4970552a0b28b0553dae5d58d17361c1ff52c00 /libavcodec | |
| parent | 7fc73d9ab781f66b63f3bbe2f384f4f639ae78e9 (diff) | |
| download | ffmpeg-4f927542fbf6ae98301a7a97e0ca41fa1ba3b04b.tar.gz | |
h264_direct: silence several warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_direct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 1f2081017b..54af4742e4 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -293,8 +293,8 @@ single_col: await_reference_mb_row(h, &h->ref_list[1][0], mb_y); - l1mv0 = &h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]]; - l1mv1 = &h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]]; + l1mv0 = (void*)&h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]]; + l1mv1 = (void*)&h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]]; l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy]; l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy]; if(!b8_stride){ @@ -484,8 +484,8 @@ single_col: await_reference_mb_row(h, &h->ref_list[1][0], mb_y); - l1mv0 = &h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]]; - l1mv1 = &h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]]; + l1mv0 = (void*)&h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]]; + l1mv1 = (void*)&h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]]; l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy]; l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy]; if(!b8_stride){ |