diff options
| -rw-r--r-- | help/help_mp-en.h | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 91beef5513..c9784c1a0f 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -566,7 +566,11 @@ static char help_text[]= #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 --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index bea92d2ae9..f8bfbf2cf0 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -54,7 +54,7 @@ demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){ // 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 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ 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 @@ static int avi_check_file(demuxer_t *demuxer) 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; } } |