Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'

* commit 'e026ee0446de27fc38e33e98704fada012fdc763':
  mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext

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

1 files changed, 4 insertions, 0 deletions

diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index b9df80fd91..1d49ab463b 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -68,6 +68,10 @@ typedef struct Mpeg4DecContext {
     int vol_sprite_usage;
     int sprite_brightness_change;
     int num_sprite_warping_points;
+    ///< sprite trajectory points
+    uint16_t sprite_traj[4][2];
+    ///< sprite shift [isChroma]
+    int sprite_shift[2];
 
     // reversible vlc
     int rvlc;