Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* commit 'f0b234ab9e406efee85c17eb435db646092a943b': avformat: AviSynth demuxer rewrite Conflicts: configure libavformat/avisynth.c See: b9ad009475 (as well as later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 9eac7c435f
parent 2d4ef7c905 f0b234ab9e
commit 9eac7c435f
1 changed files with 1 additions and 1 deletions
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@ -1,5 +1,5 @@
 /*
- * Avi/AvxSynth support
+ * AviSynth/AvxSynth support
 * Copyright (c) 2012 AvxSynth Team.
 *
 * This file is part of FFmpeg