diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 01:51:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 01:55:08 +0100 |
| commit | 3827734591d8e4a9948f3e57c53e59a549193b9e (patch) | |
| tree | 92cb724275b6ab4d80f2c05a914d7607a227b8be /libavdevice | |
| parent | 0d66268e1519fcaba0888f999c8d8738411ec0b2 (diff) | |
| download | ffmpeg-3827734591d8e4a9948f3e57c53e59a549193b9e.tar.gz | |
v4l2: fix regression that caused ffmpeg to occasionally get stuck
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/v4l2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index d356a11bf0..6726b0b89f 100644 --- 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; } |