[MPlayer-DOCS] r37846 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-en.h libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Tue Mar 22 22:52:08 2016
New Revision: 37846

Log:
demuxer.c: Apply -ni option more aggressively.

Disable the limits on maximum buffering
when -ni is specified.
This avoids issues with badly interleaved files.

Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/help/help_mp-en.h

Changes in other areas also in this revision:
Modified:
   trunk/libmpdemux/demuxer.c

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Sat Mar 19 07:23:17 2016	(r37845)
+++ trunk/DOCS/man/en/mplayer.1	Tue Mar 22 22:52:08 2016	(r37846)
@@ -1849,6 +1849,8 @@ In particular forces usage of non-interl
 of some bad AVI files).
 Can also help playing files that otherwise play audio
 and video alternating instead of at the same time.
+This can significantly increase memory usage, thus it
+would be preferable to fix interleaving of affected files.
 .
 .TP
 .B \-nobps (AVI only)

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	Sat Mar 19 07:23:17 2016	(r37845)
+++ trunk/help/help_mp-en.h	Tue Mar 22 22:52:08 2016	(r37846)
@@ -1386,8 +1386,8 @@ static const char help_text[] = MSGTR_He
 #define MSGTR_VideoStreamRedefined "WARNING: Video stream header %d redefined.\n"
 #define MSGTR_TooManyAudioInBuffer "\nToo many audio packets in the buffer: (%d in %d bytes).\n"
 #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_MaybeNI "Maybe badly- or non-interleaved stream/file or the codec failed?\n" \
+                      "Fix the file or try the -ni option (can cause high memory usage).\n"
 #define MSGTR_WorkAroundBlockAlignHeaderBug "AVI: Working around 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"