Michael Niedermayer 9eac7c435f 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>

2013-12-09 12:03:09 +01:00

20 KiB

Raw Blame History

View Raw