diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:54:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:54:30 +0200 |
| commit | 8e5a02151227f1fc4639c2047ba0059a2dba243d (patch) | |
| tree | 7f353d6a9839cf56fc97cc4f27dd556ae58310f7 | |
| parent | a23748a80429399bf30abf9ff16d23eb8b85b9c4 (diff) | |
| parent | c9be276f8b040e7d441a77f774afe94b6f137be6 (diff) | |
| download | ffmpeg-8e5a02151227f1fc4639c2047ba0059a2dba243d.tar.gz | |
Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1
* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
mpegvideo: set reference/pict_type on generated reference frames
Conflicts:
libavcodec/mpegvideo.c
See: 532b93b51631ee58443bee8aec7c2a2b2a1746be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 0a3329d2c8..566c0d2e2c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1468,7 +1468,11 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) return i; } s->last_picture_ptr = &s->picture[i]; + s->last_picture_ptr->f.key_frame = 0; + s->last_picture_ptr->f.reference = 3; + s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P; + if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) { s->last_picture_ptr = NULL; return -1; @@ -1494,6 +1498,9 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) } s->next_picture_ptr = &s->picture[i]; s->next_picture_ptr->f.key_frame = 0; + s->next_picture_ptr->f.reference = 3; + s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P; + if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) { s->next_picture_ptr = NULL; return -1; |