diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:37:28 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:37:32 +0100 |
| commit | c59c7924707e2a28f2e777c2f7c284078feae967 (patch) | |
| tree | 3c7f626f94a79be9b4c93eab24e105ee9193b961 /libavcodec/intrax8.c | |
| parent | 123fef54cc8fdadc70829ab12f587e4b64cdbc96 (diff) | |
| parent | c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f (diff) | |
| download | ffmpeg-c59c7924707e2a28f2e777c2f7c284078feae967.tar.gz | |
Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
intrax8: Use the generic horizband function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 94ef90cae9..ff828ee021 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -30,6 +30,7 @@ #include "intrax8huf.h" #include "intrax8.h" #include "intrax8dsp.h" +#include "mpegutils.h" #define MAX_TABLE_DEPTH(table_bits, max_bits) \ ((max_bits + table_bits - 1) / table_bits) @@ -773,7 +774,8 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w) int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, GetBitContext *gb, int *mb_x, int *mb_y, - int dquant, int quant_offset, int loopfilter) + int dquant, int quant_offset, + int loopfilter, int lowdelay) { MpegEncContext *const s = w->s; int mb_xy; @@ -834,7 +836,9 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, w->dest[0] += 8; } if (w->mb_y & 1) - ff_mpeg_draw_horiz_band(s, (w->mb_y - 1) * 8, 16); + ff_draw_horiz_band(w->avctx, w->frame, w->frame, + (w->mb_y - 1) * 8, 16, + PICT_FRAME, 0, lowdelay); } error: |