[FFmpeg-cvslog] v4l2: fix regression that caused ffmpeg to occasionally get stuck

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  2 01:51:29 2013 +0100| [3827734591d8e4a9948f3e57c53e59a549193b9e] | committer: Michael Niedermayer

v4l2: fix regression that caused ffmpeg to occasionally get stuck

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3827734591d8e4a9948f3e57c53e59a549193b9e
---

 libavdevice/v4l2.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index d356a11..6726b0b 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;
 }