diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-14 18:39:46 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-14 18:52:20 +0200 |
| commit | c3e2e842fa9141a4776238803100b63e14c79368 (patch) | |
| tree | e6ae22e1ebe334dfd514d67f80a00e5995863900 /doc | |
| parent | a2c90d5f9828fed298a0b6ac87067a01216b0395 (diff) | |
| parent | d78fd2fa21cde28465e40dd0be4446b1387d22a6 (diff) | |
| download | ffmpeg-c3e2e842fa9141a4776238803100b63e14c79368.tar.gz | |
Merge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'
* commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6':
Add MagicYUV decoder
Changes observed from Libav:
- many cosmetics (function renames/move, spacing, line breaks)
- MagicYUVContext.slices_size is now unsigned
- use of pixdesc (include fixed in FFmpeg)
- mention of "Lossless" in the long name dropped (also removed from
general.texi in FFmpeg)
- addition of the FF_CODEC_CAP_INIT_THREADSAFE caps
- use of qsort() instead of AV_QSORT() (NOT MERGED)
- use of AVCodecContext.{width,height} instead of AVCodecContext.coded_{width,height} (NOT MERGED)
See also 77f9c4b7aa9eb793b3019025e177245896821816
Merged-by: Clément Bœsch <u@pkh.me>
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 4db209f053..c8293b5323 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -745,7 +745,7 @@ following image formats are supported: @item LucasArts SANM/Smush @tab @tab X @tab Used in LucasArts games / SMUSH animations. @item lossless MJPEG @tab X @tab X -@item MagicYUV Lossless Video @tab @tab X +@item MagicYUV Video @tab @tab X @item Microsoft ATC Screen @tab @tab X @tab Also known as Microsoft Screen 3. @item Microsoft Expression Encoder Screen @tab @tab X |