options: rename -ni to -avi-ni

The -ni option does something with the AVI demuxer only.

Also fix misleading error messages when the packet queue overflows (it
suggests using -ni, which in the typical case of playing NI AVI files
will not work, as demux_lavf is used by default).

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

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).

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},

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;

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) {