summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-06 13:07:37 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-06 13:07:37 +0300
commit2670ceeb81e009f88812f4014e08b88317a2cf42 (patch)
treeb6f2a6367fcc8998a531d209745770789ae03fcd /libmpdemux/demuxer.h
parentb7f574405350f93083fb423c34a21788684e10d4 (diff)
parenta7b99687a7c8b59abb67f725c1cbc648ab439c74 (diff)
downloadmpv-2670ceeb81e009f88812f4014e08b88317a2cf42.tar.bz2
mpv-2670ceeb81e009f88812f4014e08b88317a2cf42.tar.xz
Merge branch 'mplayer1_changes'
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index abb3dd62b1..ee664d83e2 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -377,7 +377,7 @@ struct demuxer *new_demuxers_demuxer(struct demuxer *vd, struct demuxer *ad,
struct demuxer *sd);
// AVI demuxer params:
-extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
+extern int index_mode; // -1=untouched 0=don't use index 1=use (generate) index
extern char *index_file_save, *index_file_load;
extern int force_ni;
extern int pts_from_bps;