projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a030a1
)
indent
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2008 11:41:45 +0000
(11:41 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2008 11:41:45 +0000
(11:41 +0000)
Originally committed as revision 12805 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index 5126842fffeded4c1a5f2308b7a311820d194b0d..c85439ec06b57f3e15aa7620edd39ea2b99a7b91 100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-380,13
+380,13
@@
static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
ast->scale = get_le32(pb);
ast->rate = get_le32(pb);
if(!(ast->scale && ast->rate)){
- if(frame_period){
- ast->rate = 1000000;
- ast->scale = frame_period;
- }else{
- ast->rate = 25;
- ast->scale = 1;
- }
+
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);