diff options
| author | wm4 <wm4@nowhere> | 2012-10-28 20:23:15 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-30 19:50:22 +0100 |
| commit | e719d3610d4892f0403e6466ce135d0e4a3fb316 (patch) | |
| tree | 684a18fed7d81013ec5a90985150cdfc3008683d /libmpdemux | |
| parent | 042901940fc495f51cd23b9dee1daab089fad5b0 (diff) | |
| download | mpv-e719d3610d4892f0403e6466ce135d0e4a3fb316.tar.bz2 mpv-e719d3610d4892f0403e6466ce135d0e4a3fb316.tar.xz | |
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).
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_avi.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 2 |
2 files changed, 2 insertions, 2 deletions
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) { |