diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-06-15 09:14:00 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-06-15 09:14:00 +0000 |
| commit | 9a191b3a21489aacf5031615482bb333e72139fb (patch) | |
| tree | 7f0c68e3256d45fe342fa09b044d98bae281da19 /libavformat | |
| parent | 54a13282bd1bbcde0d84543374697e698f4b1ac5 (diff) | |
| download | ffmpeg-9a191b3a21489aacf5031615482bb333e72139fb.tar.gz | |
Support gray16be and rgb48be in mov
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index fd0d4561bf..bf2d3b1daf 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -74,6 +74,8 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, + { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') }, + { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') }, { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */ { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3495eb0408..c401862179 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -626,12 +626,14 @@ static const struct { { PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 }, { PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 }, { PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 }, + { PIX_FMT_GRAY16BE,MKTAG('b','1','6','g'), 16 }, { PIX_FMT_RGB24, MKTAG('r','a','w',' '), 24 }, { PIX_FMT_BGR24, MKTAG('2','4','B','G'), 24 }, { PIX_FMT_ARGB, MKTAG('r','a','w',' '), 32 }, { PIX_FMT_BGRA, MKTAG('B','G','R','A'), 32 }, { PIX_FMT_RGBA, MKTAG('R','G','B','A'), 32 }, { PIX_FMT_ABGR, MKTAG('A','B','G','R'), 32 }, + { PIX_FMT_RGB48BE, MKTAG('b','4','8','r'), 48 }, }; static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) |