mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'
* commit 'a65f965c04bfa27adedc0409c14cc05903f483d0': mpegvideo: Do REBASE_PICTURE with byte pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
324498f824
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue