diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2019-03-08 00:06:01 +0100 |
|---|---|---|
| committer | Martin Vignali <martin.vignali@gmail.com> | 2019-03-09 20:46:50 +0100 |
| commit | 26cf50404d1a965e88c379b4c88a5c4d7fa9f6ed (patch) | |
| tree | 99a732fadcb92df43e69b75d7788ec360611675b /libavcodec/proresenc_anatoliy.c | |
| parent | 2ff7af563a2551584c619ecdd0fae6b212668731 (diff) | |
| download | ffmpeg-streaming-26cf50404d1a965e88c379b4c88a5c4d7fa9f6ed.zip ffmpeg-streaming-26cf50404d1a965e88c379b4c88a5c4d7fa9f6ed.tar.gz | |
avcodec/proresenc_aw : fix interlace encoding for unsafe height
fix the call of the unsafe version of slice encoding in interlace mode
fix padding line count in sub image with fill in interlace mode
Diffstat (limited to 'libavcodec/proresenc_anatoliy.c')
| -rw-r--r-- | libavcodec/proresenc_anatoliy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 5914445..0fc79fc 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -485,7 +485,7 @@ static inline void subimage_with_fill_template(uint16_t *src, unsigned x, unsign } else { src_stride = stride; /* 2 lines stride */ src += y * src_stride + x; - box_height = FFMIN(height - y * 2, dst_height); + box_height = FFMIN(height/2 - y, dst_height); if (!is_top_field) src += stride >> 1; } @@ -671,7 +671,7 @@ static int prores_encode_picture(AVCodecContext *avctx, const AVFrame *pic, picture_height = avctx->height / 2; } mb_height = (picture_height + 15) >> 4; - unsafe_mb_height_limit = mb_height * 2; + unsafe_mb_height_limit = mb_height; } for (i = av_log2(DEFAULT_SLICE_MB_WIDTH); i >= 0; --i) { |
