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.

diff --git a/ChangeLog b/ChangeLog
index 97f9a0d622a4a8b969ef9ef28fab64eb9147c95b..dbcffd64a4873d12afcf75eca88e62c965b09df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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),

diff --git a/configure.ac b/configure.ac
index bca9bc852d48f61fac24887bc924032151f62f61..bb1495c3074b5b1be33ef8b125e2cad620614936 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 ****

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 5b43aee677972a1fa6e91e2e7c5fff887bf80a93..d26c0a5de55c37a05a3de6ad2da0e6d43518567a 100644 (file)
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -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;
   }
 }