diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:42:14 +0100 |
| commit | 8c6370afe3437e7f3e6398faa721f8f3e0a1e034 (patch) | |
| tree | cc2225b991dad6c027683233baf772163d4ec20d /libavcodec/h264.c | |
| parent | 0f8bb0efc3cf9e2b86c7e518f24133ea358566d5 (diff) | |
| parent | 2b4c38d3c647f409080606ef02b3363ada00be2c (diff) | |
| download | ffmpeg-streaming-8c6370afe3437e7f3e6398faa721f8f3e0a1e034.zip ffmpeg-streaming-8c6370afe3437e7f3e6398faa721f8f3e0a1e034.tar.gz | |
Merge commit '2b4c38d3c647f409080606ef02b3363ada00be2c'
* commit '2b4c38d3c647f409080606ef02b3363ada00be2c':
h264: drop some mpegvideo remnants from draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d708461..1974f66 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -99,8 +99,7 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height) { AVCodecContext *avctx = h->avctx; - const AVFrame *cur = &h->cur_pic.f; - AVFrame *last = sl->ref_list[0][0].f.data[0] ? &sl->ref_list[0][0].f : NULL; + const AVFrame *src = &h->cur_pic.f; 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; @@ -115,18 +114,9 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, return; if (avctx->draw_horiz_band) { - const AVFrame *src; int offset[AV_NUM_DATA_POINTERS]; int i; - if (cur->pict_type == AV_PICTURE_TYPE_B || h->low_delay || - (avctx->slice_flags & SLICE_FLAG_CODED_ORDER)) - src = cur; - else if (last) - src = last; - else - return; - offset[0] = y * src->linesize[0]; offset[1] = offset[2] = (y >> vshift) * src->linesize[1]; |
