Merge declaration and initialization.
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									9473993bf0
								
							
						
					
					
						commit
						fc9c2d53c3
					
				@ -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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user