diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:41:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:41:36 +0100 |
| commit | 3dab9e804afe7f971a2dc6089c5615628fb4d81c (patch) | |
| tree | e3c848b325d745ef3384705d856239a2d8bf299d | |
| parent | 3ddf9b5b7750bda97a591272fa0860e53b4f5c4f (diff) | |
| parent | 1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e (diff) | |
| download | ffmpeg-3dab9e804afe7f971a2dc6089c5615628fb4d81c.tar.gz | |
Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'
* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e':
h264: directly use frames in ff_h264_draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec3601f994..4fdfacf1a5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -237,8 +237,8 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, void ff_h264_draw_horiz_band(H264Context *h, int y, int height) { AVCodecContext *avctx = h->avctx; - Picture *cur = &h->cur_pic; - Picture *last = h->ref_list[0][0].f.data[0] ? &h->ref_list[0][0] : NULL; + AVFrame *cur = &h->cur_pic.f; + AVFrame *last = h->ref_list[0][0].f.data[0] ? &h->ref_list[0][0].f : NULL; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); int vshift = desc->log2_chroma_h; const int field_pic = h->picture_structure != PICT_FRAME; @@ -257,11 +257,11 @@ void ff_h264_draw_horiz_band(H264Context *h, int y, int height) int offset[AV_NUM_DATA_POINTERS]; int i; - if (cur->f.pict_type == AV_PICTURE_TYPE_B || h->low_delay || + if (cur->pict_type == AV_PICTURE_TYPE_B || h->low_delay || (avctx->slice_flags & SLICE_FLAG_CODED_ORDER)) - src = &cur->f; + src = cur; else if (last) - src = &last->f; + src = last; else return; |