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.c | |
| parent | 59f733d1b1814ff7e2ead43415bb4b89cbed4b0f (diff) | |
| download | ffmpeg-69cc31832f47f00be8cac9c2c97a04ebb4844dec.tar.gz | |
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.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 604c29e273..62ee92090a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2257,6 +2257,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ ++s->mb_y; if(FIELD_OR_MBAFF_PICTURE) { ++s->mb_y; + if(FRAME_MBAFF && s->mb_y < s->mb_height) + predict_field_decoding_flag(h); } } @@ -2295,6 +2297,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ ++s->mb_y; if(FIELD_OR_MBAFF_PICTURE) { ++s->mb_y; + if(FRAME_MBAFF && s->mb_y < s->mb_height) + predict_field_decoding_flag(h); } if(s->mb_y >= s->mb_height){ tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |