diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-11-10 12:30:50 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-11-10 12:30:50 +0100 |
| commit | 19e81024a32e5beef76e1f9abd7af19f7cfd8030 (patch) | |
| tree | 1f126aaa4ac1fc55ecc08e3b937cf15c9f28378f | |
| parent | a1384f990b3c58e933bd0e8c8ec779180f1925bc (diff) | |
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.
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: |