Browse Source

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>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
9eac7c435f
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/avisynth.c

+ 1
- 1
libavformat/avisynth.c View File

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


Loading…
Cancel
Save