Commit 5bc2e7ed authored by michael's avatar michael

Restructure if/else a little.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12804 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 79c9ac68
...@@ -379,14 +379,15 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -379,14 +379,15 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_le32(pb); /* initial frame */ get_le32(pb); /* initial frame */
ast->scale = get_le32(pb); ast->scale = get_le32(pb);
ast->rate = get_le32(pb); ast->rate = get_le32(pb);
if(ast->scale && ast->rate){ if(!(ast->scale && ast->rate)){
}else if(frame_period){ if(frame_period){
ast->rate = 1000000; ast->rate = 1000000;
ast->scale = frame_period; ast->scale = frame_period;
}else{ }else{
ast->rate = 25; ast->rate = 25;
ast->scale = 1; ast->scale = 1;
} }
}
av_set_pts_info(st, 64, ast->scale, ast->rate); av_set_pts_info(st, 64, ast->scale, ast->rate);
ast->cum_len=get_le32(pb); /* start */ 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