OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d66268
)
v4l2: fix regression that caused ffmpeg to occasionally get stuck
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 2 Mar 2013 00:51:29 +0000
(
01:51
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 2 Mar 2013 00:55:08 +0000
(
01:55
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/v4l2.c
patch
|
blob
|
history
diff --git
a/libavdevice/v4l2.c
b/libavdevice/v4l2.c
index
d356a11
..
6726b0b
100644
(file)
--- a/
libavdevice/v4l2.c
+++ b/
libavdevice/v4l2.c
@@
-808,6
+808,7
@@
static int v4l2_set_parameters(AVFormatContext *s1)
}
s1->streams[0]->avg_frame_rate.num = tpf->denominator;
s1->streams[0]->avg_frame_rate.den = tpf->numerator;
+ s1->streams[0]->r_frame_rate = s1->streams[0]->avg_frame_rate;
return 0;
}