mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Restructure if/else a little.
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e825656f1d
commit
4a030a1fc7
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user