From 64baa0a0c6d898e8852e6c9d8be7278fafbbb1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 30 Apr 2008 12:18:41 +0000 Subject: [PATCH] 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). --- ChangeLog | 6 ++++++ configure.ac | 2 +- gst/qtdemux/qtdemux.c | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca04301bcc..9902fdab77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-30 Tim-Philipp Müller + + * 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 * gst/qtdemux/qtdemux.c: (gst_qtdemux_videosrc_template), diff --git a/configure.ac b/configure.ac index 130d46baa2..0752247bab 100644 --- 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.18 +GST_REQ=0.10.19.1 GSTPB_REQ=0.10.18 dnl *** autotools stuff **** diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 715af9488d..c6adfe6dc6 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -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; }