generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1

Browse Source 
* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
	libavcodec/mpegvideo.c

See: 532b93b516
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-21 15:54:30 +02:00
parent a23748a804 c9be276f8b
commit 8e5a021512
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo.c
View File

@@ -1468,7 +1468,11 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
return i; return i;
} }
s->last_picture_ptr = &s->picture[i]; s->last_picture_ptr = &s->picture[i];
s->last_picture_ptr->f.key_frame = 0; 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) { if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) {
s->last_picture_ptr = NULL; s->last_picture_ptr = NULL;
return -1; 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 = &s->picture[i];
s->next_picture_ptr->f.key_frame = 0; 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) { if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
s->next_picture_ptr = NULL; s->next_picture_ptr = NULL;
return -1; return -1;