diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:44:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:45:05 +0100 |
| commit | e2f63be01284024a39a97dff9237eb4cbbb5dbbf (patch) | |
| tree | 292375339003cfe9adba551ae53e00ffa69207df /libavcodec/mpegvideo.c | |
| parent | ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (diff) | |
| parent | e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4 (diff) | |
| download | ffmpeg-e2f63be01284024a39a97dff9237eb4cbbb5dbbf.tar.gz | |
Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4':
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 460e8ac907..0db0fe6363 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -747,9 +747,9 @@ do {\ s->padding_bug_score = s1->padding_bug_score; // 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; |