- Bug fix in map stream parser
Originally committed as revision 483 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									7434ba6d53
								
							
						
					
					
						commit
						a5dc85efb8
					
				
							
								
								
									
										7
									
								
								ffmpeg.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								ffmpeg.c
									
									
									
									
									
								
							@ -489,8 +489,12 @@ static void do_video_out(AVFormatContext *s,
 | 
				
			|||||||
            ret = avcodec_encode_video(enc, 
 | 
					            ret = avcodec_encode_video(enc, 
 | 
				
			||||||
                                       video_buffer, sizeof(video_buffer), 
 | 
					                                       video_buffer, sizeof(video_buffer), 
 | 
				
			||||||
                                       picture);
 | 
					                                       picture);
 | 
				
			||||||
 | 
					            //enc->frame_number = enc->r_pict_num;
 | 
				
			||||||
            s->format->write_packet(s, ost->index, video_buffer, ret, 0);
 | 
					            s->format->write_packet(s, ost->index, video_buffer, ret, 0);
 | 
				
			||||||
            *frame_size = ret;
 | 
					            *frame_size = ret;
 | 
				
			||||||
 | 
					            //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d",
 | 
				
			||||||
 | 
					            //        enc->frame_number-1, enc->r_pict_num, ret,
 | 
				
			||||||
 | 
					            //        enc->pict_type);
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
 | 
					            write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@ -1466,7 +1470,8 @@ void opt_map(const char *arg)
 | 
				
			|||||||
    m->file_index = strtol(arg, (char **)&p, 0);
 | 
					    m->file_index = strtol(arg, (char **)&p, 0);
 | 
				
			||||||
    if (*p)
 | 
					    if (*p)
 | 
				
			||||||
        p++;
 | 
					        p++;
 | 
				
			||||||
    m->stream_index = strtol(arg, (char **)&p, 0);
 | 
					
 | 
				
			||||||
 | 
					    m->stream_index = strtol(p, (char **)&p, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void opt_recording_time(const char *arg)
 | 
					void opt_recording_time(const char *arg)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user