Use correct error code for encrypted streams.

Original commit message from CVS:
* configure.ac:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_object):
Use correct error code for encrypted streams.
This commit is contained in:
Tim-Philipp Müller 2008-07-03 13:12:26 +00:00
parent bb858a12ba
commit f887811a64
3 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2008-07-03 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_object):
Use correct error code for encrypted streams.
2008-07-02 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer),

View file

@ -47,7 +47,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.14
GST_REQ=0.10.20
GSTPB_REQ=0.10.14
dnl *** autotools stuff ****

View file

@ -3107,8 +3107,7 @@ gst_asf_demux_process_object (GstASFDemux * demux, guint8 ** p_data,
/* ERRORS */
error_encrypted:
{
GST_ELEMENT_ERROR (demux, STREAM, DEMUX,
(_("This file is encrypted and cannot be played.")), (NULL));
GST_ELEMENT_ERROR (demux, STREAM, DECRYPT, (NULL), (NULL));
return GST_FLOW_ERROR;
}
}