diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:20:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:20:11 +0100 |
| commit | 0cea39fdd310caaec96f5fe985fe7fcf8dcf38da (patch) | |
| tree | e077b3b735d42bf4e512e050dd9cb455d5180eef /libavcodec/mpeg4video.h | |
| parent | 79c1cdd973cb8abcbb95affd3fd6d8ba75e980f2 (diff) | |
| parent | b1aacd56685cd131f517e0551834a0bbd3f5f809 (diff) | |
| download | ffmpeg-0cea39fdd310caaec96f5fe985fe7fcf8dcf38da.tar.gz | |
Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'
* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 2 |
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; |