# HG changeset patch # User ramiro # Date 1212771181 0 # Node ID 670052821b9f9eead0e6dc942f744f84ff028f5e # Parent b0936b8a0337c42927699c30aa68bd2f51843627 Merge declaration and initialization. diff -r b0936b8a0337 -r 670052821b9f utils.c --- a/utils.c Thu Jun 05 15:03:55 2008 +0000 +++ b/utils.c Fri Jun 06 16:53:01 2008 +0000 @@ -2496,9 +2496,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) { - int ret; - - ret=compute_pkt_fields2(s->streams[pkt->stream_index], pkt); + int ret = compute_pkt_fields2(s->streams[pkt->stream_index], pkt); + if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret;