Fix REBASE_PICTURE with h.264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix REBASE_PICTURE with h.264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
98fe404a · Michael Niedermayer · b5ef6f8e · 98fe404a
Commit 98fe404a authored Apr 05, 2011 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mpegvideo.h libavcodec/mpegvideo.h +4 -1

No files found.
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -686,7 +686,10 @@ typedef struct MpegEncContext {
    void (*denoise_dct)(struct MpegEncContext *s, DCTELEM *block);
 } MpegEncContext;

-#define REBASE_PICTURE(pic, new_ctx, old_ctx) (pic ? &new_ctx->picture[pic - old_ctx->picture] : 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] : pic - (Picture*)old_ctx + (Picture*)new_ctx)\
+    : NULL)

 void MPV_decode_defaults(MpegEncContext *s);
 int MPV_common_init(MpegEncContext *s);