From 19e81024a32e5beef76e1f9abd7af19f7cfd8030 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 10 Nov 2009 12:30:50 +0100 Subject: Always give the most video restricted caps possible When the video caps aren't fixed yet, make sure we return the most precise set of caps. It seems a regression was introduced in cc082f, causing restricted caps to never be used if the context == NULL None of the restricted caps generation uses the context, so no need to check whether the context. Fixes bug #578160. --- ext/ffmpeg/gstffmpegcodecmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 0e9dda1..584be8e 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -201,7 +201,7 @@ gst_ff_vid_caps_new (AVCodecContext * context, enum CodecID codec_id, "framerate", GST_TYPE_FRACTION, context->time_base.den / context->ticks_per_frame, context->time_base.num, NULL); - } else if (context) { + } else { /* so we are after restricted caps in this case */ switch (codec_id) { case CODEC_ID_H261: -- cgit v1.2.3