git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e825656
)
Restructure if/else a little.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2008 11:41:09 +0000
(11:41 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2008 11:41:09 +0000
(11:41 +0000)
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
0d02f02
..
5126842
100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-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 */