avviddec: only use upstream framerate if really specified

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=704161
This commit is contained in:
Mark Nauwelaerts 2013-12-02 20:21:34 +01:00
parent fa5865c0cd
commit 039b608b24

View file

@ -926,7 +926,8 @@ gst_ffmpegviddec_negotiate (GstFFMpegVidDec * ffmpegdec,
out_info->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE; out_info->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
/* try to find a good framerate */ /* 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) */ /* take framerate from input when it was specified (#313970) */
fps_n = in_info->fps_n; fps_n = in_info->fps_n;
fps_d = in_info->fps_d; fps_d = in_info->fps_d;