diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-05 13:40:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-05 13:40:28 +0000 |
| commit | 725de25c4c1d0db8d3bd1abc27db0bbba274cb1d (patch) | |
| tree | d70dd2752079cd0b203a827732c16fbb648c419c /libavcodec/motion_est.c | |
| parent | 5fddb9b3821bd65f343213695a6cde1223f0e13e (diff) | |
| download | ffmpeg-725de25c4c1d0db8d3bd1abc27db0bbba274cb1d.tar.gz | |
fix segfault with 'ffmpeg -i 1.avi -cmp 257 -4mv 2.avi'
Originally committed as revision 4178 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 8fbbdf5d22..f49eda1ff9 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -269,7 +269,7 @@ void ff_init_me(MpegEncContext *s){ // 8x8 fullpel search would need a 4x4 chroma compare, which we dont have yet, and even if we had the motion estimation code doesnt expect it if(s->codec_id != CODEC_ID_SNOW){ - if((c->avctx->me_cmp&FF_CMP_CHROMA) && !s->dsp.me_cmp[2]){ + if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){ s->dsp.me_cmp[2]= zero_cmp; } if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){ |