set block align in av_write_header if not set, fix issue #489
Originally committed as revision 15277 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		@@ -2444,6 +2444,9 @@ int av_write_header(AVFormatContext *s)
 | 
				
			|||||||
                av_log(s, AV_LOG_ERROR, "sample rate not set\n");
 | 
					                av_log(s, AV_LOG_ERROR, "sample rate not set\n");
 | 
				
			||||||
                return -1;
 | 
					                return -1;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            if(!st->codec->block_align)
 | 
				
			||||||
 | 
					                st->codec->block_align = st->codec->channels *
 | 
				
			||||||
 | 
					                    av_get_bits_per_sample(st->codec->codec_id) >> 3;
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
        case CODEC_TYPE_VIDEO:
 | 
					        case CODEC_TYPE_VIDEO:
 | 
				
			||||||
            if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too?
 | 
					            if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too?
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user