Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
  mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext

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

1 files changed, 2 insertions, 0 deletions

diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index d735a68fa2..f378a8d47c 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -70,6 +70,8 @@ typedef struct Mpeg4DecContext {
     int rvlc;
     ///< could this stream contain resync markers
     int resync_marker;
+    ///< time distance of first I -> B, used for interlaced b frames
+    int t_frame;
 
     /* bug workarounds */
     int divx_version;