mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
* commit '58c215961a9067bb670387bbd72286c30de04b93':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See: edf34c346e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c738ffcf2c
@ -82,10 +82,10 @@ const AVCodecTag ff_nut_video_tags[] = {
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },
|
||||
|
Loading…
Reference in New Issue
Block a user