diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 14:50:37 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-17 15:47:51 +0100 |
| commit | 7b7d8b879428bd4bcaf1a5e31b731fc86a8b43a3 (patch) | |
| tree | d5ed190c3a4df5376589acffdb83ad0dc24181a3 | |
| parent | 90d6b563fe815b7be7fb9ce675927b64d0ba3f34 (diff) | |
| download | ffmpeg-7b7d8b879428bd4bcaf1a5e31b731fc86a8b43a3.tar.gz | |
avcodec/mpegvideo_enc: dont use direct mode for unaligned input
Fixes Ticket3456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06a3185e38614ff22e4586675b85228f07819452)
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index bb49822ce2..64d73dd6eb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1039,6 +1039,10 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) direct = 0; if ((s->width & 15) || (s->height & 15)) direct = 0; + if (((intptr_t)(pic_arg->data[0])) & (STRIDE_ALIGN-1)) + direct = 0; + if (s->linesize & (STRIDE_ALIGN-1)) + direct = 0; av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); |