diff options
| author | Jeff Downs <heydowns@borg.com> | 2007-10-06 15:44:58 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2007-10-06 15:44:58 +0000 |
| commit | fa178ed2a4f7a42eaad8236dd73f28c6d426df6d (patch) | |
| tree | 70fee0108a7c48f26b8a22ea0f1a4b17027d9643 | |
| parent | f3e53d9fcd4016d1d8d220464c4262e5f4cb79a5 (diff) | |
| download | ffmpeg-fa178ed2a4f7a42eaad8236dd73f28c6d426df6d.tar.gz | |
Set Picture.poc for fields and field pairs. Part of PAFF implementation.
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30
Originally committed as revision 10673 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a65c9901ea..b1e5bb11f6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3682,11 +3682,15 @@ static int init_poc(H264Context *h){ field_poc[1]= poc; } - if(s->picture_structure != PICT_BOTTOM_FIELD) + if(s->picture_structure != PICT_BOTTOM_FIELD) { s->current_picture_ptr->field_poc[0]= field_poc[0]; - if(s->picture_structure != PICT_TOP_FIELD) + s->current_picture_ptr->poc = field_poc[0]; + } + if(s->picture_structure != PICT_TOP_FIELD) { s->current_picture_ptr->field_poc[1]= field_poc[1]; - if(s->picture_structure == PICT_FRAME) // FIXME field pix? + s->current_picture_ptr->poc = field_poc[1]; + } + if(!FIELD_PICTURE || !s->first_field) s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); return 0; |