RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 15:23:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-12-09 11:44:37 +01:00
commit 9eac7c435f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avisynth.c
View File

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