diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-19 01:23:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-19 01:23:19 +0000 |
| commit | 350fc614b48190d46e6e66e78ba4031a8290e574 (patch) | |
| tree | fba2309717bfd51852681b26dbe882485cabe714 | |
| parent | 49c43fc278c7499d96575c61626cb244a53f76b3 (diff) | |
| download | ffmpeg-350fc614b48190d46e6e66e78ba4031a8290e574.tar.gz | |
Remove code that handles the case of a MB pair to our right being available.
Thats not possible except maybe in FMO which noone uses anyway.
iam also not sure if this wasnt missing a part_width.
Originally committed as revision 21312 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264_mvpred.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 675187d906..6b89ad7209 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -47,10 +47,6 @@ static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, in *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0; *C = h->mv_cache[list][scan8[0]-2]; - if(!MB_FIELD - && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){ - int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3); - if(IS_INTERLACED(mb_types[topright_xy])){ #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\ const int x4 = X4, y4 = Y4;\ const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\ @@ -61,9 +57,6 @@ static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, in h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\ return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP; - SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1); - } - } if(topright_ref == PART_NOT_AVAILABLE && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){ |