summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2008-06-06 16:53:01 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2008-06-06 16:53:01 +0000
commitfc9c2d53c39fac446b7b05db639ee4ccb39e37d4 (patch)
tree338040d5128096941c4b1eaeaa85b19963e2def1
parent9473993bf027c84566e7a469d572ced08179d92e (diff)
downloadffmpeg-streaming-fc9c2d53c39fac446b7b05db639ee4ccb39e37d4.zip
ffmpeg-streaming-fc9c2d53c39fac446b7b05db639ee4ccb39e37d4.tar.gz
Merge declaration and initialization.
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e7e3128..bab4a3c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2496,9 +2496,8 @@ static void truncate_ts(AVStream *st, AVPacket *pkt){
int av_write_frame(AVFormatContext *s, AVPacket *pkt)
{
- int ret;
+ int ret = compute_pkt_fields2(s->streams[pkt->stream_index], pkt);
- ret=compute_pkt_fields2(s->streams[pkt->stream_index], pkt);
if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return ret;
OpenPOWER on IntegriCloud