Mercurial > libavformat.hg
changeset 3429:670052821b9f libavformat
Merge declaration and initialization.
| author | ramiro |
|---|---|
| date | Fri, 06 Jun 2008 16:53:01 +0000 |
| parents | b0936b8a0337 |
| children | 08987e520651 |
| files | utils.c |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;