Author: reimar Date: Sun Aug 31 11:39:13 2014 New Revision: 37262 Log: Support -ni option for all formats. Can work around playback issues with badly interleaved files. Modified: trunk/cfg-common.h trunk/libmpdemux/demuxer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Aug 31 11:33:38 2014 (r37261) +++ trunk/cfg-common.h Sun Aug 31 11:39:13 2014 (r37262) @@ -406,7 +406,7 @@ const m_option_t common_opts[] = { {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, - // AVI specific: force non-interleaved mode + // force non-interleaved mode {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sun Aug 31 11:33:38 2014 (r37261) +++ trunk/libmpdemux/demuxer.c Sun Aug 31 11:39:13 2014 (r37262) @@ -722,7 +722,7 @@ int ds_fill_buffer(demux_stream_t *ds) // This needs to be enough for at least 1 second of packets // since libavformat mov demuxer does not try to interleave // with more than 1s precision. - if (ds->fill_count > 80) + if (!force_ni && ds->fill_count > 80) break; // avoid printing the "too many ..." message over and over if (ds->eof)