diff options
| -rw-r--r-- | DOCS/man/en/changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 2 | ||||
| -rw-r--r-- | cfg-mplayer.h | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 402bdbd336..fd7e123ddc 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -98,6 +98,7 @@ Command line switches -subdelay --sub-delay -subpos --sub-pos -forcedsubsonly --sub-forced-only + -ni --avi-ni =================================== =================================== input.conf and slave commands diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 1c1a9a842d..0fb150e44e 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1238,7 +1238,7 @@ --name Set the window class name for X11-based video output methods. ---ni +--avi-ni (Internal AVI demuxer which is not used by default only) Force usage of non-interleaved AVI parser (fixes playback of some bad AVI files). diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 762dd0ed95..1a6a41586d 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -385,7 +385,7 @@ const m_option_t common_opts[] = { {"endpos", &end_at, CONF_TYPE_TIME_SIZE, 0, 0, 0, NULL}, // AVI specific: force non-interleaved mode - {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"avi-ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, // AVI and Ogg only: (re)build index at startup {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL}, diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 69fdd4ffd5..887494c6cd 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -283,7 +283,7 @@ do{ if(ds) if(ds->packs+1>=MAX_PACKS || ds->bytes+len>=MAX_PACK_BYTES){ // this packet will cause a buffer overflow, switch to -ni mode!!! - mp_tmsg(MSGT_DEMUX,MSGL_WARN,"\nBadly interleaved AVI file detected - switching to -ni mode...\n"); + mp_tmsg(MSGT_DEMUX,MSGL_WARN,"\nBadly interleaved AVI file detected - switching to --avi-ni mode...\n"); if(priv->idx_size>0){ // has index demux->type=DEMUXER_TYPE_AVI_NI; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8c9092004e..b827a64018 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -657,7 +657,7 @@ int ds_fill_buffer(demux_stream_t *ds) } #define 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") + "For AVI files, try to force non-interleaved mode with the --demuxer=avi --avi-ni options.\n") if (demux->audio->packs >= MAX_PACKS || demux->audio->bytes >= MAX_PACK_BYTES) { |