diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:23:16 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
commit | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (patch) | |
tree | fd94e38b01629f219d21ed88f9c19bdf6225139a /libavcodec/mpegvideo.c | |
parent | 35e0833d410e31d9fd35695ad798c5d13de2af58 (diff) | |
download | ffmpeg-ee8af2dd99dcb7a01a667deedec81d1aa2a00d72.tar.gz |
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
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 737a92fa84..de446a8042 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -717,7 +717,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; |