diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:32:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:32:41 +0200 |
| commit | ce27c9eb25986ffb79fa77ad978c7ed676f02aac (patch) | |
| tree | 67a526c8fce268228d9cd2503141ab497159a4e0 | |
| parent | b6c3487e7f2f8f0d8fae9df023c46ed3112c7443 (diff) | |
| parent | 7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692 (diff) | |
| download | ffmpeg-ce27c9eb25986ffb79fa77ad978c7ed676f02aac.tar.gz | |
Merge commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692'
* commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692':
vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f954a2a13f..10a75e2cfd 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -431,7 +431,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir) if (v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP) || s->h_edge_pos < 22 || v_edge_pos < 22 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel * 3 - || (unsigned)(src_y - s->mspel) > v_edge_pos - (my&3) - 16 - s->mspel * 3) { + || (unsigned)(src_y - 1) > v_edge_pos - (my&3) - 16 - 3) { uint8_t *uvbuf = s->edge_emu_buffer + 19 * s->linesize; srcY -= s->mspel * (1 + s->linesize); |