Author: ods15 Date: Sat Apr 1 14:47:31 2006 New Revision: 119 Log: give back err from convert() Modified: trunk/nututils/nutmerge.c Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sat Apr 1 14:47:31 2006 @@ -184,7 +184,7 @@ for (i = 0; streams[i].stream_id >= 0; i++); - convert(out, &demuxer, streams, i); + err = convert(out, &demuxer, streams, i); err_out: if (demuxer.priv) demuxer.uninit(demuxer.priv);