diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-25 11:47:30 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-25 11:47:30 -0400 |
| commit | 699e4f4d044d8111053b631baba4b324a60b1274 (patch) | |
| tree | 2589ff173711852d2ca94feb6b481c948793d94f /sys/vdpau | |
| parent | 218878de5ea48b5acdf36070a73a50fd71f41741 (diff) | |
| parent | 1bb23517feced9fb3dddf702e93391c3a969fbf2 (diff) | |
| download | gst-plugins-bad-699e4f4d044d8111053b631baba4b324a60b1274.tar.gz gst-plugins-bad-699e4f4d044d8111053b631baba4b324a60b1274.tar.bz2 gst-plugins-bad-699e4f4d044d8111053b631baba4b324a60b1274.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'sys/vdpau')
| -rw-r--r-- | sys/vdpau/gstvdpdevice.h | 20 | ||||
| -rw-r--r-- | sys/vdpau/gstvdpvideoyuv.c | 3 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sys/vdpau/gstvdpdevice.h b/sys/vdpau/gstvdpdevice.h index ac036d73..38cd84bb 100644 --- a/sys/vdpau/gstvdpdevice.h +++ b/sys/vdpau/gstvdpdevice.h @@ -86,6 +86,16 @@ static const VdpChromaType chroma_types[N_CHROMA_TYPES] = static const VdpauFormats formats[N_FORMATS] = { { VDP_CHROMA_TYPE_420, + VDP_YCBCR_FORMAT_YV12, + GST_MAKE_FOURCC ('I', '4', '2', '0') + }, + { + VDP_CHROMA_TYPE_420, + VDP_YCBCR_FORMAT_YV12, + GST_MAKE_FOURCC ('Y', 'V', '1', '2') + }, + { + VDP_CHROMA_TYPE_420, VDP_YCBCR_FORMAT_NV12, GST_MAKE_FOURCC ('N', 'V', '1', '2') }, @@ -108,16 +118,6 @@ static const VdpauFormats formats[N_FORMATS] = { VDP_CHROMA_TYPE_422, VDP_YCBCR_FORMAT_YUYV, GST_MAKE_FOURCC ('Y', 'U', 'Y', 'V') - }, - { - VDP_CHROMA_TYPE_420, - VDP_YCBCR_FORMAT_YV12, - GST_MAKE_FOURCC ('Y', 'V', '1', '2') - }, - { - VDP_CHROMA_TYPE_420, - VDP_YCBCR_FORMAT_YV12, - GST_MAKE_FOURCC ('I', '4', '2', '0') } }; diff --git a/sys/vdpau/gstvdpvideoyuv.c b/sys/vdpau/gstvdpvideoyuv.c index 2318cd40..bd780075 100644 --- a/sys/vdpau/gstvdpvideoyuv.c +++ b/sys/vdpau/gstvdpvideoyuv.c @@ -332,6 +332,9 @@ gst_vdp_video_yuv_sink_set_caps (GstPad * pad, GstCaps * caps) if (G_UNLIKELY (!src_caps || !gst_caps_get_size (src_caps))) return FALSE; + GST_DEBUG_OBJECT (video_yuv, + "Selecting first caps from set: %" GST_PTR_FORMAT, src_caps); + new_caps = gst_caps_copy_nth (src_caps, 0); gst_caps_unref (src_caps); if (G_UNLIKELY (!new_caps)) |