mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpeg: Fix merge mistakes

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-10 11:39:27 +01:00
parent bde3117e72
commit 44a1dc0138
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ffmpeg/gstffmpegdec.c
View file

@ -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;
}

8
ext/libpostproc/gstpostproc.c
View file

@ -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;
}

2
gst-libs/ext/libav

@ -1 +1 @@
Subproject commit 0b8b3387a977dcdb6fb9e53bcc9966d34b2e4cec
Subproject commit 85afbb1d00d58812df5d634e946b2fcf653bcd8e