summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/demuxers/demux_mpeg_block.c4
-rw-r--r--src/xine-engine/xine_interface.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index e12906382..67675aafd 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.168 2003/04/08 14:24:27 hadess Exp $
+ * $Id: demux_mpeg_block.c,v 1.169 2003/04/08 18:10:45 miguelfreitas Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -454,7 +454,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
xine_log (this->stream->xine, XINE_LOG_MSG,
_("demux_mpeg_block: too many errors, stopping playback. Maybe this stream is scrambled?\n"));
this->status = DEMUX_FINISHED;
- xine_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Encrypted media stream.\nPlayback aborted.\nMaybe libdvdcss is missing.", NULL);
+ xine_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Playback aborted", NULL);
}
}
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 780ce2b87..a2b0c92ad 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_interface.c,v 1.50 2003/04/06 23:58:18 miguelfreitas Exp $
+ * $Id: xine_interface.c,v 1.51 2003/04/08 18:10:47 miguelfreitas Exp $
*
* convenience/abstraction layer, functions to implement
* libxine's public interface
@@ -721,7 +721,8 @@ int xine_message(xine_stream_t *stream, int type, ...) {
"Connection refused:",
"File not found:",
"Read error from:",
- "Error loading library:"
+ "Error loading library:",
+ "Encrypted media stream detected",
};
if( type >= 0 && type <= sizeof(std_explanation)/