Commit fc9c2d53 authored by Ramiro Polla's avatar Ramiro Polla

Merge declaration and initialization.

Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9473993b
...@@ -2496,9 +2496,8 @@ static void truncate_ts(AVStream *st, AVPacket *pkt){ ...@@ -2496,9 +2496,8 @@ static void truncate_ts(AVStream *st, AVPacket *pkt){
int av_write_frame(AVFormatContext *s, 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)) if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment