Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support some BOXX codecs.

Browse Source 
Fixes a part of ticket #1352.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/59/head
ami_stuff 13 years ago committed by Michael Niedermayer
parent c0b47d1914
commit ca8623e1a5
2 changed files with 7 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavcodec/raw.c
  2. 4
      libavformat/isom.c

3
libavcodec/raw.c
Unescape View File

@ -138,6 +138,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },
{ PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', 'y') },
{ PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */
{ PIX_FMT_UYVY422, MKTAG('b', 'x', 'y', 'v') },
{ PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') },
{ PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
{ PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
@ -145,8 +146,10 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') },
{ PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') },
{ PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') },
{ PIX_FMT_BGR24, MKTAG('b', 'x', 'b', 'g') },
{ PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
{ PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
{ PIX_FMT_RGB24, MKTAG('b', 'x', 'r', 'g') },
{ PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
{ PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') },
{ PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') },

4
libavformat/isom.c
Unescape View File

@ -83,6 +83,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ 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_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') },
{ CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') },
{ CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') },
{ CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
{ CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */
@ -92,6 +95,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ CODEC_ID_AVRP, MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */
{ CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
{ CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10BIT 4:2:2 */
{ CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */
{ CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4:4 */
{ CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */

Write Preview
Loading…
Cancel
Save