diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-25 03:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-25 03:45:10 +0200 |
| commit | 0f45e643cc09986ac7dc16de0c1705acf1c84377 (patch) | |
| tree | 4f721ae9204b46b53ed90314f149fc30db14a1bb | |
| parent | af62b42736c00332d39965168b5cc966a06f07d6 (diff) | |
| download | ffmpeg-0f45e643cc09986ac7dc16de0c1705acf1c84377.tar.gz | |
avcodec/h264_slice: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 49af2c13d0..5f67b54ae3 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -446,9 +446,9 @@ static void clone_tables(H264Context *dst, H264Context *src, int i) #define IN_RANGE(a, b, size) (((a) >= (b)) && ((a) < ((b) + (size)))) #undef REBASE_PICTURE #define REBASE_PICTURE(pic, new_ctx, old_ctx) \ - ((pic && pic >= old_ctx->DPB && \ - pic < old_ctx->DPB + H264_MAX_PICTURE_COUNT) ? \ - &new_ctx->DPB[pic - old_ctx->DPB] : NULL) + (((pic) && (pic) >= (old_ctx)->DPB && \ + (pic) < (old_ctx)->DPB + H264_MAX_PICTURE_COUNT) ? \ + &(new_ctx)->DPB[(pic) - (old_ctx)->DPB] : NULL) static void copy_picture_range(H264Picture **to, H264Picture **from, int count, H264Context *new_base, @@ -486,8 +486,8 @@ static int copy_parameter_set(void **to, void **from, int count, int size) } #define copy_fields(to, from, start_field, end_field) \ - memcpy(&to->start_field, &from->start_field, \ - (char *)&to->end_field - (char *)&to->start_field) + memcpy(&(to)->start_field, &(from)->start_field, \ + (char *)&(to)->end_field - (char *)&(to)->start_field) static int h264_slice_header_init(H264Context *h, int reinit); @@ -966,13 +966,13 @@ static void init_scan_tables(H264Context *h) { int i; for (i = 0; i < 16; i++) { -#define TRANSPOSE(x) (x >> 2) | ((x << 2) & 0xF) +#define TRANSPOSE(x) ((x) >> 2) | (((x) << 2) & 0xF) h->zigzag_scan[i] = TRANSPOSE(zigzag_scan[i]); h->field_scan[i] = TRANSPOSE(field_scan[i]); #undef TRANSPOSE } for (i = 0; i < 64; i++) { -#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3) +#define TRANSPOSE(x) ((x) >> 3) | (((x) & 7) << 3) h->zigzag_scan8x8[i] = TRANSPOSE(ff_zigzag_direct[i]); h->zigzag_scan8x8_cavlc[i] = TRANSPOSE(zigzag_scan8x8_cavlc[i]); h->field_scan8x8[i] = TRANSPOSE(field_scan8x8[i]); |