diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 05:11:50 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 05:34:18 +0400 |
commit | 7c29313b387392fa305365e855fa408cd28c276e (patch) | |
tree | 328f30ad4a4e6b606bbbffc1f15f22d2044affb3 /doc/general.texi | |
parent | f371396dfb95c116a05e9b9f690fa916bb2d815e (diff) | |
parent | 2a216ca2ef29282cac9003a716b469b8c80c0a15 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in revision for AVFrame.age deprecation
avcodec: deprecate AVFrame.age
4xm: remove unneeded check for remaining unused data.
lavf: force threads to 1 in avformat_find_stream_info()
swscale: fix overflows in vertical scaling at top/bottom edges.
lavf: add OpenMG audio muxer.
omadec: split data that will be used in the muxer to a separate file.
lavf: rename oma.c -> omadec.c
tmv decoder: set correct pix_fmt
Conflicts:
Changelog
doc/APIchanges
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/oma.c
libavformat/version.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
-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 5de23c6aec..2b048f92eb 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -317,7 +317,7 @@ library: @tab Used in Sierra CD-ROM games. @item Smacker @tab @tab X @tab Multimedia format used by many games. -@item Sony OpenMG (OMA) @tab @tab X +@item Sony OpenMG (OMA) @tab X @tab X @tab Audio format used in Sony Sonic Stage and Sony Vegas. @item Sony PlayStation STR @tab @tab X @item Sony Wave64 (W64) @tab @tab X |