diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
| commit | e168b508163d7dc05176d81e6b5ea73ac23eb38b (patch) | |
| tree | d6fc72152fcc1e94a4b101380bdf62a28432d564 /libavcodec/h264_cavlc.c | |
| parent | 137df692fc28710aa1a21856b1f5b9e157896fef (diff) | |
| parent | da6be8fcec16a94d8084bda8bb8a0a411a96bcf7 (diff) | |
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
h264: add a parameter to the MB_FIELD macro.
h264: add a parameter to the MB_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index e966878fae..7d074adcf6 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -756,7 +756,7 @@ decode_intra_mb: mb_type= i_mb_type_info[mb_type].type; } - if(MB_FIELD) + if(MB_FIELD(h)) mb_type |= MB_TYPE_INTERLACED; h->slice_table[ mb_xy ]= h->slice_num; @@ -778,8 +778,8 @@ decode_intra_mb: return 0; } - local_ref_count[0] = h->ref_count[0] << MB_MBAFF; - local_ref_count[1] = h->ref_count[1] << MB_MBAFF; + local_ref_count[0] = h->ref_count[0] << MB_MBAFF(h); + local_ref_count[1] = h->ref_count[1] << MB_MBAFF(h); fill_decode_neighbors(h, mb_type); fill_decode_caches(h, mb_type); |