Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:27:05 +0000 (21:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:27:10 +0000 (21:27 +0100)
* commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1':
  mpegvideo: move REBASE_PICTURE where it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_slice.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

@@@ -443,11 -422,11 +443,11 @@@ static void clone_tables(H264Context *d
  }
  
  #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,
Simple merge
Simple merge