diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-04 12:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-04 12:37:15 +0100 |
| commit | a2bff49e26a9c0bc6caa5ba3b7479df7afe00342 (patch) | |
| tree | f139f626bd5fbc863fc94f7e0b1d9d3576f8bf8b /libavcodec/mpegvideo.h | |
| parent | b5f544a0f9981ee1676128cb6c3711a2ec80fe1b (diff) | |
| parent | d9df93efbf59b1dc8b013d174ca4ad9c634c28f7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: simplify REBASE_PICTURE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7f9d2078a1..0675004948 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -724,10 +724,10 @@ typedef struct MpegEncContext { int context_reinit; } MpegEncContext; -#define REBASE_PICTURE(pic, new_ctx, old_ctx) (pic ? \ - (pic >= old_ctx->picture && pic < old_ctx->picture+old_ctx->picture_count ?\ - &new_ctx->picture[pic - old_ctx->picture] : (Picture*) ((uint8_t*)pic - (uint8_t*)old_ctx + (uint8_t*)new_ctx))\ - : NULL) +#define REBASE_PICTURE(pic, new_ctx, old_ctx) \ + ((pic && pic >= old_ctx->picture && \ + pic < old_ctx->picture + old_ctx->picture_count) ? \ + &new_ctx->picture[pic - old_ctx->picture] : NULL) /* mpegvideo_enc common options */ #define FF_MPV_FLAG_SKIP_RD 0x0001 |