har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure if/else a little.

Browse Source 
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-04-13 11:41:09 +00:00
parent e825656f1d
commit 4a030a1fc7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avidec.c
View File

@ -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 */