Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: simplify REBASE_PICTURE

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

libavcodec/mpegvideo.h

@@ -724,10 +724,10 @@ typedef struct MpegEncContext {
     int context_reinit;
 } MpegEncContext;
 
-#define REBASE_PICTURE(pic, new_ctx, old_ctx) (pic ? \
+#define REBASE_PICTURE(pic, new_ctx, old_ctx)             \
-    (pic >= old_ctx->picture && pic < old_ctx->picture+old_ctx->picture_count ?\
+    ((pic && pic >= old_ctx->picture &&                   \
-        &new_ctx->picture[pic - old_ctx->picture] : (Picture*) ((uint8_t*)pic - (uint8_t*)old_ctx + (uint8_t*)new_ctx))\
+      pic < old_ctx->picture + old_ctx->picture_count) ?  \
-    : NULL)
+        &new_ctx->picture[pic - old_ctx->picture] : NULL)
 
 /* mpegvideo_enc common options */
 #define FF_MPV_FLAG_SKIP_RD      0x0001