diff options
| author | Andrew Wason <rectalogic@rectalogic.com> | 2009-11-03 16:17:21 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2009-11-03 16:17:21 +0000 |
| commit | 42022e0362151a3cafa86a54be2f3187a1899398 (patch) | |
| tree | a487ab3efcac63f8cd83bac1f8fb447fa0d1b5b1 | |
| parent | 31f8c109836066fe34b03a15fa1fb19fea3d2cff (diff) | |
add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.mov
patch by Andrew Wason
Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/raw.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 63f6b6147a..ee3edb6da7 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -62,6 +62,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, + { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, { PIX_FMT_NONE, 0 }, diff --git a/libavformat/isom.c b/libavformat/isom.c index f6b504d4d3..5830ce94fd 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -64,6 +64,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */ { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */ { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ + { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */ { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ |