summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/ffmpeg/gstffmpegdec.c8
-rw-r--r--ext/libpostproc/gstpostproc.c8
m---------gst-libs/ext/libav0
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index f370e7f..0d9225f 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -491,11 +491,11 @@ gst_ffmpegdec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
GstClockTime min_lat, max_lat, our_lat;
gst_query_parse_latency (query, &live, &min_lat, &max_lat);
- if (ffmpegdec->format.video.fps_n > 0)
+ if (ffmpegdec->out_info.fps_n > 0)
our_lat =
gst_util_uint64_scale_int (ffmpegdec->context->has_b_frames *
- GST_SECOND, ffmpegdec->format.video.fps_d,
- ffmpegdec->format.video.fps_n);
+ GST_SECOND, ffmpegdec->out_info.fps_d,
+ ffmpegdec->out_info.fps_n);
else
our_lat =
gst_util_uint64_scale_int (ffmpegdec->context->has_b_frames *
@@ -510,7 +510,7 @@ gst_ffmpegdec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
}
break;
default:
- res = gst_pad_query_default (pad, query);
+ res = gst_pad_query_default (pad, parent, query);
break;
}
diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c
index 7278a7d..aa05a9f 100644
--- a/ext/libpostproc/gstpostproc.c
+++ b/ext/libpostproc/gstpostproc.c
@@ -371,10 +371,10 @@ gst_post_proc_base_init (GstPostProcClass * klass)
g_free (longname);
g_free (description);
- gst_element_class_add_static_pad_template (element_class,
- &gst_post_proc_src_template);
- gst_element_class_add_static_pad_template (element_class,
- &gst_post_proc_sink_template);
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_post_proc_src_template));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_post_proc_sink_template));
klass->filterid = ppidx;
}
diff --git a/gst-libs/ext/libav b/gst-libs/ext/libav
-Subproject 0b8b3387a977dcdb6fb9e53bcc9966d34b2e4ce
+Subproject 85afbb1d00d58812df5d634e946b2fcf653bcd8