diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-09-30 17:28:28 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-04 11:58:53 +0200 |
| commit | 12bd8532cf09883e5d1f1ec817c18a376147deb8 (patch) | |
| tree | d80b1f77416ebea1629174e4fe073634fa41931c /libavcodec/raw.c | |
| parent | 7d49f79f1cd47783a963a757a6563b9cac29db62 (diff) | |
| download | ffmpeg-12bd8532cf09883e5d1f1ec817c18a376147deb8.tar.gz | |
Synchronize various 4CCs and codec tags from FFmpeg.
Diffstat (limited to 'libavcodec/raw.c')
| -rw-r--r-- | libavcodec/raw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index aa1ea308b0..cdd217536e 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -36,6 +36,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') }, { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, { PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') }, + { PIX_FMT_YUV422P, MKTAG('Y', 'V', '1', '6') }, /* yuvjXXX formats are deprecated hacks specific to libav*, they are identical to yuvXXX */ { PIX_FMT_YUVJ420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ @@ -44,7 +45,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') }, { PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') }, { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, - { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, + { PIX_FMT_GRAY8, MKTAG('Y', '8', ' ', ' ') }, { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') }, @@ -135,6 +136,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { /* special */ { PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ + { PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */ { PIX_FMT_NONE, 0 }, }; |