mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

that'll teach me to copypaste

Browse source 
Original commit message from CVS:
that'll teach me to copypaste
This commit is contained in:
Thomas Vander Stichele 2006-02-12 21:03:53 +00:00
parent 231adecd88
commit c72d7e8b49
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1141,7 +1141,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
{ {
GstStructure *structure; GstStructure *structure;
const GValue *fps; const GValue *fps;
const GValue *par; const GValue *par = NULL;
GST_DEBUG ("converting caps %" GST_PTR_FORMAT, caps); GST_DEBUG ("converting caps %" GST_PTR_FORMAT, caps);
g_return_if_fail (gst_caps_get_size (caps) == 1); g_return_if_fail (gst_caps_get_size (caps) == 1);
@ -1164,7 +1164,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
} }
par = gst_structure_get_value (structure, "pixel-aspect-ratio"); par = gst_structure_get_value (structure, "pixel-aspect-ratio");
if (par != NULL && GST_VALUE_HOLDS_FRACTION (par)) { if (par && GST_VALUE_HOLDS_FRACTION (par)) {
context->sample_aspect_ratio.num = gst_value_get_fraction_numerator (par); context->sample_aspect_ratio.num = gst_value_get_fraction_numerator (par);
context->sample_aspect_ratio.den = gst_value_get_fraction_denominator (par); context->sample_aspect_ratio.den = gst_value_get_fraction_denominator (par);
@ -1178,7 +1178,6 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
return; return;
g_return_if_fail (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)); g_return_if_fail (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps));
g_return_if_fail (par != NULL && GST_VALUE_HOLDS_FRACTION (par));
if (strcmp (gst_structure_get_name (structure), "video/x-raw-yuv") == 0) { if (strcmp (gst_structure_get_name (structure), "video/x-raw-yuv") == 0) {
guint32 fourcc; guint32 fourcc;