diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-17 02:14:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-17 02:14:02 +0000 |
| commit | 69cc31832f47f00be8cac9c2c97a04ebb4844dec (patch) | |
| tree | 6a6c7536323b69f913c353aec244a7c3b2a38bb0 /libavcodec/h264.h | |
| parent | 59f733d1b1814ff7e2ead43415bb4b89cbed4b0f (diff) | |
Move check for and call of predict_field_decoding_flag() from the mb code to
the row code. This function would only be needed on a MB basis for MBAFF+FMO
Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 2eec36309e..13a7b9b90f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1453,7 +1453,7 @@ static inline int get_dct8x8_allowed(H264Context *h){ static void predict_field_decoding_flag(H264Context *h){ MpegEncContext * const s = &h->s; - const int mb_xy= h->mb_xy; + const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) ? s->current_picture.mb_type[mb_xy-1] : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) |