diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:19:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:19:37 +0100 |
| commit | 324498f824701ab0bc1f666269e073c8922703ca (patch) | |
| tree | f785cd4351d5082988df9d1776fc9c0af439d66e /libavcodec/mpegvideo.h | |
| parent | ed341549bbc220eb65d4bb8b9bbc36ab4a3e4ed1 (diff) | |
| parent | a65f965c04bfa27adedc0409c14cc05903f483d0 (diff) | |
| download | ffmpeg-324498f824701ab0bc1f666269e073c8922703ca.tar.gz | |
Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'
* commit 'a65f965c04bfa27adedc0409c14cc05903f483d0':
mpegvideo: Do REBASE_PICTURE with byte pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8e704a6af2..7f9d2078a1 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -726,7 +726,7 @@ typedef struct 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] : pic - (Picture*)old_ctx + (Picture*)new_ctx)\ + &new_ctx->picture[pic - old_ctx->picture] : (Picture*) ((uint8_t*)pic - (uint8_t*)old_ctx + (uint8_t*)new_ctx))\ : NULL) /* mpegvideo_enc common options */ |