1 files changed, 9 insertions, 8 deletions

diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index f6c7fc5169..ddc5d218dd 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "help_mp.h"
+#include "options.h"
 
 #include "stream/stream.h"
 #include "demuxer.h"
@@ -58,7 +58,6 @@ typedef struct mpg_demuxer {
   int a_stream_ids[MAX_A_STREAMS];
 } mpg_demuxer_t;
 
-extern char* dvdsub_lang;
 static int mpeg_pts_error=0;
 off_t ps_probe = 0;
 
@@ -483,7 +482,7 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){
 
         if(demux->sub->id > -1)
           demux->sub->id &= 0x1F;
-        if(!dvdsub_lang && demux->sub->id == -1)
+        if(!demux->opts->sub_lang && demux->sub->id == -1)
           demux->sub->id = aid;
         if(demux->sub->id==aid){
             ds=demux->sub;
@@ -726,9 +725,10 @@ static int demux_mpg_probe(demuxer_t *demuxer) {
         } else
         {
           if(demuxer->synced==2)
-            mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
+              mp_msg(MSGT_DEMUXER, MSGL_ERR, "MPEG: %s",
+                     mp_gtext("Missing video stream!? Contact the author, it may be a bug :(\n"));
           else
-            mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
+            mp_tmsg(MSGT_DEMUXER,MSGL_V,"Not MPEG System Stream format... (maybe Transport Stream?)\n");
         }
   }
   //FIXME this shouldn't be necessary
@@ -866,7 +866,7 @@ do{
       if(!ret)
         if(--max_packs==0){
           demux->stream->eof=1;
-          mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream);
+          mp_tmsg(MSGT_DEMUX,MSGL_ERR,"demux: File doesn't contain the selected audio or video stream.\n");
           return 0;
         }
       if(demux->synced==3) demux->synced=(ret==1)?2:0; // PES detect
@@ -1015,7 +1015,7 @@ static int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg)
     switch(cmd) {
 	case DEMUXER_CTRL_GET_TIME_LENGTH:
             if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg) != STREAM_UNSUPPORTED) {
-              mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3lf)\r\n", *((double*)arg));
+              mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3f)\r\n", *((double*)arg));
               return DEMUXER_CTRL_GUESS;
             }
             if (mpg_d && mpg_d->has_valid_timestamps) {
@@ -1104,7 +1104,8 @@ static demuxer_t* demux_mpg_ps_open(demuxer_t* demuxer)
 
     if(demuxer->audio->id!=-2) {
         if(!ds_fill_buffer(demuxer->audio)){
-            mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
+            mp_msg(MSGT_DEMUXER, MSGL_INFO, "MPEG: %s",
+                   mp_gtext("No audio stream found -> no sound.\n"));
             demuxer->audio->sh=NULL;
         } else {
             sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio;