Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 10:44:37 +0000 (11:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 11:03:09 +0000 (12:03 +0100)
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
configure
libavformat/avisynth.c

See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avisynth.c

index aac00fc..2f438d9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Avi/AvxSynth support
+ * AviSynth/AvxSynth support
  * Copyright (c) 2012 AvxSynth Team.
  *
  * This file is part of FFmpeg