From aa617518b9e2161f33d7115a76a15200a9a041e9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 22 Sep 2008 20:46:52 +0000 Subject: A few empty lines for readability. Originally committed as revision 15385 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8f0ef8d449..690efb1a45 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -963,18 +963,23 @@ static inline void direct_ref_list_init(H264Context * const h){ int list, j, field, rfield; int sidx= (s->picture_structure&1)^1; int ref1sidx= (ref1->reference&1)^1; + for(list=0; list<2; list++){ cur->ref_count[sidx][list] = h->ref_count[list]; for(j=0; jref_count[list]; j++) cur->ref_poc[sidx][list][j] = 4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3); } + if(s->picture_structure == PICT_FRAME){ memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0])); memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0])); } + cur->mbaff= FRAME_MBAFF; + if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred) return; + for(list=0; list<2; list++){ fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0); for(field=0; field<2; field++) -- cgit v1.2.3