diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:43:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:43:55 +0100 |
| commit | c738ffcf2c0717ed3546ea7e0d06cc4df2026024 (patch) | |
| tree | e4074b6c4df0bc579ef52be714524c21e9c5ce4c /libavformat/nut.c | |
| parent | 3731c409890c2edd76ededfbc6038d940d2b0afb (diff) | |
| parent | 58c215961a9067bb670387bbd72286c30de04b93 (diff) | |
| download | ffmpeg-c738ffcf2c0717ed3546ea7e0d06cc4df2026024.tar.gz | |
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
* commit '58c215961a9067bb670387bbd72286c30de04b93':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See: edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
| -rw-r--r-- | libavformat/nut.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index c36bb6a371..2447abbe54 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -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 ) }, |