generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: drop some mpegvideo remnants from draw_horiz_band()

Browse Source 
This code makes no sense for h.264.
This commit is contained in:
Anton Khirnov
2015-01-28 19:36:21 +01:00
parent 5bf3c0fa49
commit 2b4c38d3c6
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/h264.c
View File

@@ -82,8 +82,7 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl,
int y, int height) int y, int height)
{ {
AVCodecContext *avctx = h->avctx; AVCodecContext *avctx = h->avctx;
const AVFrame *cur = &h->cur_pic.f; const AVFrame *src = &h->cur_pic.f;
AVFrame *last = sl->ref_list[0][0].f.data[0] ? &sl->ref_list[0][0].f : NULL;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
int vshift = desc->log2_chroma_h; int vshift = desc->log2_chroma_h;
const int field_pic = h->picture_structure != PICT_FRAME; const int field_pic = h->picture_structure != PICT_FRAME;
@@ -98,18 +97,9 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl,
return; return;
if (avctx->draw_horiz_band) { if (avctx->draw_horiz_band) {
const AVFrame *src;
int offset[AV_NUM_DATA_POINTERS]; int offset[AV_NUM_DATA_POINTERS];
int i; 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[0] = y * src->linesize[0];
offset[1] = offset[1] =
offset[2] = (y >> vshift) * src->linesize[1]; offset[2] = (y >> vshift) * src->linesize[1];