diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-17 02:25:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-17 02:25:05 +0000 |
| commit | 69a28f3e2bdbf10ac5b4e73fafa447eb570e1da4 (patch) | |
| tree | b125caecd28872a90c33319c81a9fc69e049595c /libavcodec/h264.h | |
| parent | 69cc31832f47f00be8cac9c2c97a04ebb4844dec (diff) | |
| download | ffmpeg-69a28f3e2bdbf10ac5b4e73fafa447eb570e1da4.tar.gz | |
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
there as well.
Originally committed as revision 21861 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 13a7b9b90f..10658d36d5 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1451,17 +1451,6 @@ static inline int get_dct8x8_allowed(H264Context *h){ 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 */ |