virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Reorder nut specific codec tags and add a comment for marking them as

Browse Source 
such.

Also put the [3][0][0][0] codec tag, mapped to rgb565le, in a special
section. It needs to be specified *after* the nut RGB[16] codec tag,
otherwise it will be used by default when encoding normal non-flipped
rgb565le, and will be decoded like a flipped format (see
rawdec.c:raw_init_decoder()).

Originally committed as revision 23075 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-05-09 23:04:06 +00:00
parent 43451ec247
commit 658e7576fc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/raw.c
View File

@ -64,11 +64,12 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
{ PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') }, { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
{ PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
/* nut */
{ PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) }, { PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },
{ PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) }, { PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) },
{ PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) }, { PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) },
{ PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) }, { PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) },
{ PIX_FMT_RGB565LE, MKTAG( 3 , 0 , 0 , 0) },
{ PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') }, { PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') },
{ PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') }, { PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') },
{ PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') }, { PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') },
@ -88,6 +89,9 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
{ PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') },
/* special */
{ PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
{ PIX_FMT_NONE, 0 }, { PIX_FMT_NONE, 0 },
}; };