summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-12-20 11:20:24 +0100
committerAnton Khirnov <anton@khirnov.net>2014-01-09 09:43:59 +0100
commitca96e337169093979d7c763064ad9dae12b3108c (patch)
treee839a43558c0e9b723b77e4cb5cde525a6b75b0c /libavcodec
parentef8c93e2f18c624d0c266687e43ab99af7921dd3 (diff)
vp9: drop support for real (non-emulated) edges
They are not measurably faster on x86, they might be somewhat faster on other platforms due to missing emu edge SIMD, but the gain is not large enough to justify the added complexity.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vp9block.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c
index e6865934c4..caf3bcc2ae 100644
--- a/libavcodec/vp9block.c
+++ b/libavcodec/vp9block.c
@@ -1583,9 +1583,9 @@ int ff_vp9_decode_block(AVCodecContext *avctx, int row, int col,
* This allows to support emu-edge and so on even if we have large
* block overhangs. */
emu[0] = (col + w4) * 8 > s->cur_frame->linesize[0] ||
- (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE);
+ (row + h4) > s->rows;
emu[1] = (col + w4) * 4 > s->cur_frame->linesize[1] ||
- (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE);
+ (row + h4) > s->rows;
if (emu[0]) {
b->dst[0] = s->tmp_y;
b->y_stride = 64;