diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-29 01:37:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 21:47:07 +0400 |
| commit | 6d695d7acc4cb1da84eb73710e05a4c090e5ab31 (patch) | |
| tree | 444928cbecc1b2963f3eaf58c9b8ded047e1c106 /libavcodec/mpegvideo_enc.c | |
| parent | 527f5cbf64e7ac7fe265a244ebf36650e50921dc (diff) | |
Fix nonsense non-mod16 AMV flipping code.
It is obviously nonsense since it produces wrong results
or even crashes (crashes should be encode-only though).
Fixes trac issue #1092.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f27ef7bc74..9f36c8f3b7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1110,10 +1110,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) uint8_t *src = pic_arg->data[i]; uint8_t *dst = pic->f->data[i]; - if (s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)) { - h = ((s->height + 15)/16*16) >> v_shift; - } - if (!s->avctx->rc_buffer_size) dst += INPLACE_OFFSET; |