← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gst-plugins-bad0.10/quantal-proposed

« back to all changes in this revision

Viewing changes to gst/asfmux/gstrtpasfpay.c

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-07-19 14:32:43 UTC
  • mfrom: (18.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20110719143243-p7pnkh45akfp0ihk
Tags: 0.10.22-2ubuntu1
* Rebased on debian unstable, remaining changes:
  - debian/gstreamer-plugins-bad.install
    * don't include dtmf, liveadder, rtpmux, autoconvert and shm, we include 
      them in -good

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst/asfmux/gstrtpasfpay.c
312
312
static GstFlowReturn
313
313
gst_rtp_asf_pay_parse_headers (GstRtpAsfPay * rtpasfpay)
314
314
{
315
 
  GstFlowReturn ret = GST_FLOW_OK;
316
315
  gchar *maxps;
317
316
  g_return_val_if_fail (rtpasfpay->headers, GST_FLOW_ERROR);
318
317
 
346
345
  return GST_FLOW_OK;
347
346
 
348
347
error:
349
 
  ret = GST_FLOW_ERROR;
350
 
  GST_ERROR_OBJECT (rtpasfpay, "Error while parsing headers");
351
 
  return GST_FLOW_ERROR;
 
348
  {
 
349
    GST_ELEMENT_ERROR (rtpasfpay, STREAM, DECODE, (NULL),
 
350
        ("Error parsing headers"));
 
351
    return GST_FLOW_ERROR;
 
352
  }
352
353
}
353
354
 
354
355
static GstFlowReturn