[FFmpeg-cvslog] ffmpeg: use the frame rate computed by lavfi.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Jun  5 12:43:33 2012 +0200| [8362d734a3521b49fbc4942da49d45969e73c067] | committer: Nicolas George

ffmpeg: use the frame rate computed by lavfi.

This frame rate is more reliable than the one copied
from the input stream, so it is used in priority.

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

 ffmpeg.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 1611536..c73f286 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2915,6 +2915,8 @@ static int transcode_init(void)
             ost->encoding_needed = 1;
 
             if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                if (ost->filter && !ost->frame_rate.num)
+                    ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
                 if (ist && !ost->frame_rate.num)
                     ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25, 1};
                 if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {