diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:26:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:26:39 +0200 |
| commit | c7d17179571daa875083e2fe72c498ae47772d75 (patch) | |
| tree | 63c60576f671d518e272fdca55d5371db82f7d35 /doc | |
| parent | 5fae4678949b2a24225c152867ebd97c4918dc53 (diff) | |
| parent | 0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8 (diff) | |
| download | ffmpeg-c7d17179571daa875083e2fe72c498ae47772d75.tar.gz | |
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
Conflicts:
doc/general.texi
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 2aa7d5a58f..3d6bf78640 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -168,7 +168,7 @@ library: @item AST @tab X @tab X @tab Audio format used on the Nintendo Wii. @item AVI @tab X @tab X -@item AVISynth @tab @tab X +@item AviSynth @tab @tab X @item AVR @tab @tab X @tab Audio format used on Mac. @item AVS @tab @tab X |