diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
| commit | 01b9b5002fb057604855dffc9faac4903df4b8d7 (patch) | |
| tree | e6fc518a8dadb3d755e4ee409becba0cd783fee8 /gst/mxf/mxfdemux.c | |
| parent | 2988a4ccb224f0be59e0b67ca84e88a01bcee8ec (diff) | |
| parent | cc9e4903138894963e52d52dfc22ffb23d763b9c (diff) | |
| download | gstreamer-plugins-bad-01b9b5002fb057604855dffc9faac4903df4b8d7.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
Diffstat (limited to 'gst/mxf/mxfdemux.c')
| -rw-r--r-- | gst/mxf/mxfdemux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index 9036c4cae..496ee38f7 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -3358,7 +3358,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event) GST_PAD_STREAM_UNLOCK (demux->sinkpad); - return TRUE; + return ret; /* ERRORS */ wrong_format: |