RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge declaration and initialization. 

Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2008-06-06 16:53:01 +00:00
parent 9473993bf0
commit fc9c2d53c3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/utils.c
View File

@ -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;