diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:35:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:35:52 +0100 |
| commit | ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (patch) | |
| tree | 43a9d022b3843dd8e4762b9ec777800f7cfcad8d /libavcodec/mpegvideo.c | |
| parent | be0b869b04c049ea00fd178bb4c4fe4b767ed31d (diff) | |
| parent | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (diff) | |
| download | ffmpeg-ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019.tar.gz | |
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72':
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 00d58dce89..460e8ac907 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -748,7 +748,8 @@ do {\ // MPEG4 timing info memcpy(&s->time_increment_bits, &s1->time_increment_bits, - (char *) &s1->shape - (char *) &s1->time_increment_bits); + (char *) &s1->pb_field_time + sizeof(s1->pb_field_time) - + (char *) &s1->time_increment_bits); // B-frame info s->max_b_frames = s1->max_b_frames; |