Use new error code for encrypted streams (which requires core CVS).

Original commit message from CVS:
* configure.ac:
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
Use new error code for encrypted streams (which requires core CVS).
This commit is contained in:
Tim-Philipp Müller 2008-04-30 12:18:41 +00:00
parent e483f6c651
commit 64baa0a0c6
3 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2008-04-30 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac:
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
Use new error code for encrypted streams (which requires core CVS).
2008-04-30 Tim-Philipp Müller <tim.muller at collabora co uk>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_videosrc_template),

View file

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

View file

@ -3591,8 +3591,7 @@ corrupt_file:
}
error_encrypted:
{
GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is encrypted and cannot be played.")), (NULL));
GST_ELEMENT_ERROR (qtdemux, STREAM, DECRYPT, (NULL), (NULL));
g_free (stream);
return FALSE;
}