diff options
| author | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2010-06-08 13:36:53 +0200 |
|---|---|---|
| committer | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2010-06-23 21:51:52 +0200 |
| commit | 4926c6c617416228882c4382d286f38bc34eee45 (patch) | |
| tree | 91258f5c91668feb3b739f4471b0928c74b7fd65 | |
| parent | a9687846f64356490182b3f94a477478bb2d93e5 (diff) | |
| download | gstreamer-plugins-bad-4926c6c617416228882c4382d286f38bc34eee45.tar.gz | |
vdpauvideopostprocess: fix small bug
| -rw-r--r-- | sys/vdpau/gstvdpvideopostprocess.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/vdpau/gstvdpvideopostprocess.c b/sys/vdpau/gstvdpvideopostprocess.c index 506f6d213..822a88cce 100644 --- a/sys/vdpau/gstvdpvideopostprocess.c +++ b/sys/vdpau/gstvdpvideopostprocess.c @@ -328,7 +328,7 @@ gst_vdp_vpp_add_buffer (GstVdpVideoPostProcess * vpp, GstVdpVideoBuffer * buf) pic2.structure = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD; } else { pic1.structure = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD; - pic1.structure = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD; + pic2.structure = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD; } pic1.timestamp = GST_BUFFER_TIMESTAMP (buf); @@ -700,6 +700,12 @@ gst_vdp_vpp_drain (GstVdpVideoPostProcess * vpp) continue; + invalid_caps: + gst_buffer_unref (GST_BUFFER (outbuf)); + GST_ELEMENT_ERROR (vpp, STREAM, FAILED, ("Invalid output caps"), (NULL)); + ret = GST_FLOW_ERROR; + break; + render_error: gst_buffer_unref (GST_BUFFER (outbuf)); GST_ELEMENT_ERROR (vpp, RESOURCE, READ, @@ -707,11 +713,6 @@ gst_vdp_vpp_drain (GstVdpVideoPostProcess * vpp) ("Error returned from vdpau was: %s", device->vdp_get_error_string (status))); ret = GST_FLOW_ERROR; - - invalid_caps: - gst_buffer_unref (GST_BUFFER (outbuf)); - GST_ELEMENT_ERROR (vpp, STREAM, FAILED, ("Invalid output caps"), (NULL)); - ret = GST_FLOW_ERROR; break; output_pad_error: |