diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
| commit | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (patch) | |
| tree | e37df66f9571e2753a827c23ba8c075a8af5d323 /libavcodec/h264_mvpred.h | |
| parent | e168b508163d7dc05176d81e6b5ea73ac23eb38b (diff) | |
| parent | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (diff) | |
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 1d13994cd1..0a184b984c 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -41,7 +41,7 @@ static av_always_inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, /* there is no consistent mapping of mvs to neighboring locations that will * make mbaff happy, so we can't move all this logic to fill_caches */ - if (FRAME_MBAFF) { + if (FRAME_MBAFF(h)) { #define SET_DIAG_MV(MV_OP, REF_OP, XY, Y4) \ const int xy = XY, y4 = Y4; \ const int mb_type = mb_types[xy + (y4 >> 2) * h->mb_stride]; \ @@ -230,7 +230,7 @@ static av_always_inline void pred_8x16_motion(H264Context *const h, } #define FIX_MV_MBAFF(type, refn, mvn, idx) \ - if (FRAME_MBAFF) { \ + if (FRAME_MBAFF(h)) { \ if (MB_FIELD(h)) { \ if (!IS_INTERLACED(type)) { \ refn <<= 1; \ @@ -368,7 +368,7 @@ static void fill_decode_neighbors(H264Context *h, int mb_type) topright_xy = top_xy + 1; left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1; h->left_block = left_block_options[0]; - if (FRAME_MBAFF) { + if (FRAME_MBAFF(h)) { const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.mb_type[mb_xy - 1]); const int curr_mb_field_flag = IS_INTERLACED(mb_type); if (h->mb_y & 1) { @@ -677,7 +677,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) } } - if ((mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2)) && !FRAME_MBAFF) + if ((mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2)) && !FRAME_MBAFF(h)) continue; if (!(mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2))) { @@ -759,7 +759,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) MAP_F2F(scan8[0] - 1 + 2 * 8, left_type[LBOT]) \ MAP_F2F(scan8[0] - 1 + 3 * 8, left_type[LBOT]) - if (FRAME_MBAFF) { + if (FRAME_MBAFF(h)) { if (MB_FIELD(h)) { #define MAP_F2F(idx, mb_type) \ |