diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-07-22 14:02:16 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-07-22 14:02:16 -0400 |
| commit | ef6dbf9be87af7a91a50a910f8578ce3de75846c (patch) | |
| tree | ef2ba06906d155c8dee835bdaafa06d09628e8bc /sys/vdpau | |
| parent | ba89c9e518ded3d919461903a444799a5115c34f (diff) | |
| parent | 87a97e24d4b4e63dc2fa3a3a12f9b30bfbe54368 (diff) | |
| download | gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.tar.gz gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.tar.bz2 gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.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/gstvdpmpegdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/vdpau/gstvdpmpegdec.c b/sys/vdpau/gstvdpmpegdec.c index 674146c4..c3fb324e 100644 --- a/sys/vdpau/gstvdpmpegdec.c +++ b/sys/vdpau/gstvdpmpegdec.c @@ -172,7 +172,8 @@ gst_vdp_mpeg_dec_set_caps (GstPad * pad, GstCaps * caps) gboolean res; const GValue *value; - VdpDecoderProfile profile; + /* Default to MPEG1 until we find otherwise */ + VdpDecoderProfile profile = VDP_DECODER_PROFILE_MPEG1; GstVdpDevice *device; VdpStatus status; @@ -210,8 +211,6 @@ gst_vdp_mpeg_dec_set_caps (GstPad * pad, GstCaps * caps) /* parse caps to setup decoder */ gst_structure_get_int (structure, "mpegversion", &mpeg_dec->version); - if (mpeg_dec->version == 1) - profile = VDP_DECODER_PROFILE_MPEG1; value = gst_structure_get_value (structure, "codec_data"); if (value) { |