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)
commit9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2
tree721000665d348c5104e77ec6cb0dcaf39efdb69d
parent2d4ef7c9054dfeb20531e70e3144a4bf8ffc8255
parentf0b234ab9e406efee85c17eb435db646092a943b
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* 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