diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
| commit | 68939f7682de3e87251c6e08470d5779804ddd6d (patch) | |
| tree | 6eba76563947a5802befcf9effc39ee7638343ba /doc | |
| parent | 3974889614e04f700637b564df737c180d8583ea (diff) | |
| parent | 08c2d8f0aa679c2f060721d1d0d4f33d2ae32368 (diff) | |
| download | ffmpeg-streaming-68939f7682de3e87251c6e08470d5779804ddd6d.zip ffmpeg-streaming-68939f7682de3e87251c6e08470d5779804ddd6d.tar.gz | |
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
Go2Meeting decoder
Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 68ff58b..67562fe 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -667,6 +667,8 @@ following image formats are supported: @tab Sorenson H.263 used in Flash @item Forward Uncompressed @tab @tab X @item Fraps @tab @tab X +@item Go2Meeting @tab @tab X + @tab fourcc: G2M2, G2M3 @item Go2Webinar @tab @tab X @tab fourcc: G2M4 @item H.261 @tab X @tab X |
