# HG changeset patch # User kraymer # Date 1162744562 0 # Node ID c44d7b2316e65a5dfdb5bc8204f9798b1e71327d # Parent ce1fcbcca6f211adf9a17b60ae802f384a98ec4e MSGTRs for demux_avi.c diff -r ce1fcbcca6f2 -r c44d7b2316e6 help/help_mp-en.h --- a/help/help_mp-en.h Sun Nov 05 16:34:45 2006 +0000 +++ b/help/help_mp-en.h Sun Nov 05 16:36:02 2006 +0000 @@ -566,7 +566,11 @@ #define MSGTR_TooManyVideoInBuffer "\nToo many video packets in the buffer: (%d in %d bytes).\n" #define MSGTR_MaybeNI "Maybe you are playing a non-interleaved stream/file or the codec failed?\n" \ "For AVI files, try to force non-interleaved mode with the -ni option.\n" +#define MSGTR_WorkaroundingnBlockAlignHeaderBug "AVI: Workarounding CBR-MP3 nBlockAlign header bug!\n" #define MSGTR_SwitchToNi "\nBadly interleaved AVI file detected - switching to -ni mode...\n" +#define MSGTR_InvalidAudioStreamNosound "AVI: invalid audio stream ID: %d - ignoring (nosound)\n" +#define MSGTR_InvalidAudioStreamUsingDefault "AVI: invalid video stream ID: %d - ignoring (using default)\n" +#define MSGTR_ON2AviFormat "ON2 AVI format" #define MSGTR_Detected_XXX_FileFormat "%s file format detected.\n" #define MSGTR_DetectedAudiofile "Audio file detected.\n" #define MSGTR_NotSystemStream "Not MPEG System Stream format... (maybe Transport Stream?)\n" diff -r ce1fcbcca6f2 -r c44d7b2316e6 libmpdemux/demux_avi.c --- a/libmpdemux/demux_avi.c Sun Nov 05 16:34:45 2006 +0000 +++ b/libmpdemux/demux_avi.c Sun Nov 05 16:36:02 2006 +0000 @@ -54,7 +54,7 @@ // workaround old mencoder's bug: if(sh->audio.dwSampleSize==1 && sh->audio.dwScale==1 && (sh->wf->nBlockAlign==1152 || sh->wf->nBlockAlign==576)){ - mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: Workarounding CBR-MP3 nBlockAlign header bug!\n"); + mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_WorkaroundingnBlockAlignHeaderBug); priv->audio_block_size=1; } } @@ -410,11 +410,11 @@ read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK_BW)?index_mode:-2); if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ - mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id); + mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_InvalidAudioStreamNosound,demuxer->audio->id); demuxer->audio->id=-2; // disabled } if(demuxer->video->id>=0 && !demuxer->v_streams[demuxer->video->id]){ - mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid video stream ID: %d - ignoring (using default)\n",demuxer->video->id); + mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_InvalidAudioStreamUsingDefault,demuxer->video->id); demuxer->video->id=-1; // autodetect } @@ -789,7 +789,7 @@ if(id==formtypeAVI) return DEMUXER_TYPE_AVI; if(id==mmioFOURCC('O','N','2','f')){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,"ON2 AVI format"); + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_ON2AviFormat); return DEMUXER_TYPE_AVI; } }