Fix merging error and compilation.

Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>

modules/codec/davinci/viddec.c

@@ -161,7 +161,6 @@ error:
     if( p_sys->e ) Engine_close( p_sys->e );
     free( p_sys );
     free( psz_codec );
-    free( psz_engine );
     return VLC_EGENERIC;
 }