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 | e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4 (patch) | |
| tree | f574c51104f552354ccec8eb208d9a0427a2b2af /libavcodec/mpegvideo.c | |
| parent | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (diff) | |
| download | ffmpeg-e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4.tar.gz | |
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
The field remains in MpegEncContext for use in the encoder.
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index de446a8042..5886e5b882 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -716,9 +716,9 @@ do {\ s->workaround_bugs = s1->workaround_bugs; // MPEG4 timing info - memcpy(&s->time_increment_bits, &s1->time_increment_bits, + memcpy(&s->last_time_base, &s1->last_time_base, (char *) &s1->pb_field_time + sizeof(s1->pb_field_time) - - (char *) &s1->time_increment_bits); + (char *) &s1->last_time_base); // B-frame info s->max_b_frames = s1->max_b_frames; |