diff options
| author | Mark Nauwelaerts <mnauw@users.sourceforge.net> | 2013-12-02 20:21:34 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-12-04 14:04:52 +0100 |
| commit | 1408d272733809fdd9d339a226fa6e9f36c90f51 (patch) | |
| tree | 596bd04526ef4f0a51d661ed247744224d6c3e94 | |
| parent | 1abea0c1de952c76e46498c48ef2fe980ab798c6 (diff) | |
avviddec: only use upstream framerate if really specified
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=704161
| -rw-r--r-- | ext/libav/gstavviddec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index 0635767..d278d70 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -920,7 +920,8 @@ gst_ffmpegviddec_negotiate (GstFFMpegVidDec * ffmpegdec, out_info->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE; /* try to find a good framerate */ - if (in_info->fps_d) { + if ((in_info->fps_d && in_info->fps_n) || + GST_VIDEO_INFO_FLAG_IS_SET (in_info, GST_VIDEO_FLAG_VARIABLE_FPS)) { /* take framerate from input when it was specified (#313970) */ fps_n = in_info->fps_n; fps_d = in_info->fps_d; |