Commit 4a030a1f authored by Michael Niedermayer's avatar Michael Niedermayer

Restructure if/else a little.

Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e825656f
......@@ -379,14 +379,15 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_le32(pb); /* initial frame */
ast->scale = get_le32(pb);
ast->rate = get_le32(pb);
if(ast->scale && ast->rate){
}else if(frame_period){
if(!(ast->scale && ast->rate)){
if(frame_period){
ast->rate = 1000000;
ast->scale = frame_period;
}else{
ast->rate = 25;
ast->scale = 1;
}
}
av_set_pts_info(st, 64, ast->scale, ast->rate);
ast->cum_len=get_le32(pb); /* start */
......
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