Mercurial > libavcodec.hg
changeset 11192:e1b4f03037d5 libavcodec
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
there as well.
| author | michael |
|---|---|
| date | Wed, 17 Feb 2010 02:25:05 +0000 |
| parents | 5e583a785508 |
| children | e5ebf3a17d9d |
| files | h264.c h264.h |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Wed Feb 17 02:14:02 2010 +0000 +++ b/h264.c Wed Feb 17 02:25:05 2010 +0000 @@ -2200,6 +2200,17 @@ h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale); } +static void predict_field_decoding_flag(H264Context *h){ + MpegEncContext * const s = &h->s; + 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) + ? s->current_picture.mb_type[mb_xy-s->mb_stride] + : 0; + h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; +} + static int decode_slice(struct AVCodecContext *avctx, void *arg){ H264Context *h = *(void**)arg; MpegEncContext * const s = &h->s;
--- a/h264.h Wed Feb 17 02:14:02 2010 +0000 +++ b/h264.h Wed Feb 17 02:25:05 2010 +0000 @@ -1451,17 +1451,6 @@ return !(*(uint64_t*)h->sub_mb_type & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8|MB_TYPE_DIRECT2)*0x0001000100010001ULL)); } -static void predict_field_decoding_flag(H264Context *h){ - MpegEncContext * const s = &h->s; - 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) - ? s->current_picture.mb_type[mb_xy-s->mb_stride] - : 0; - h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; -} - /** * decodes a P_SKIP or B_SKIP macroblock */