diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2008-04-30 12:18:41 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2008-04-30 12:18:41 +0000 |
| commit | 64baa0a0c6d898e8852e6c9d8be7278fafbbb1cb (patch) | |
| tree | f4c7d2246a3eddab4ee31d32f84082ee4a9186e5 | |
| parent | e483f6c651ad2ba618636d751716fba155400c99 (diff) | |
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).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,11 @@ 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), (gst_qtdemux_audiosrc_template): Fix swapped pad template names, spotted by Thiago Sousa Santos. diff --git a/configure.ac b/configure.ac index 130d46ba..0752247b 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 715af948..c6adfe6d 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; } |