diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-21 23:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-21 23:46:59 +0000 |
| commit | a0ad40832f4c21b579ff4676dd6302d8a78b70ea (patch) | |
| tree | 42cd771327eafe4bca1d4bdbd64a55c3578d6a89 | |
| parent | 1b6e8b734c61260c5202affafae4781627ad136f (diff) | |
Simplify initialization of a few direct mode related variables.
Originally committed as revision 15377 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 246fc5e329..f188d5bb1c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -987,14 +987,12 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL - if(h->ref_list[1][0].reference == PICT_FRAME){ // AFL/AFR/FR/FL -> AFL if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL int cur_poc = s->current_picture_ptr->poc; int *col_poc = h->ref_list[1]->field_poc; int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc); mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride; b8_stride = 0; - } }else if(!(s->picture_structure & h->ref_list[1][0].reference)){// FL -> FL & differ parity int fieldoff= 2*(h->ref_list[1][0].reference)-3; mb_xy += s->mb_stride*fieldoff; |