From 299d58e18a7b6c9597e854305927f9c3c1e26fd8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 8 May 2012 10:37:13 +0200 Subject: Support yuva422p rawvideo in nut. --- libavcodec/raw.c | 1 + libavformat/nut.c | 1 + tests/ref/lavfi/pixdesc | 2 +- tests/ref/lavfi/pixfmts_copy | 2 +- tests/ref/lavfi/pixfmts_null | 2 +- tests/ref/lavfi/pixfmts_pad | 2 +- tests/ref/lavfi/pixfmts_scale | 2 +- tests/ref/lavfi/pixfmts_vflip | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index c10b52fd5b..2a6d7d0129 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -130,6 +130,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) }, { PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') }, { PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, + { PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) }, { PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) }, { PIX_FMT_GRAY8A, MKTAG('Y', '2', 0 , 8 ) }, diff --git a/libavformat/nut.c b/libavformat/nut.c index 1cfcadcef3..0f9044c8d4 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -93,6 +93,7 @@ const AVCodecTag ff_nut_video_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, { CODEC_ID_NONE , 0 } diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index f627fb41da..cfff332d75 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -61,7 +61,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva422p 92b6815f465297284cdb843711682cee +yuva422p 85a8b4813cf90c3b194307f181717693 yuva444p 706799c07e91db8d2ca3187cdc0c82df yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index f763d4b19d..7e0f837271 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -62,7 +62,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva422p 92b6815f465297284cdb843711682cee +yuva422p 85a8b4813cf90c3b194307f181717693 yuva444p 706799c07e91db8d2ca3187cdc0c82df yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 2f2daf828b..26f51517fc 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -62,7 +62,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva422p 92b6815f465297284cdb843711682cee +yuva422p 85a8b4813cf90c3b194307f181717693 yuva444p 706799c07e91db8d2ca3187cdc0c82df yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb diff --git a/tests/ref/lavfi/pixfmts_pad b/tests/ref/lavfi/pixfmts_pad index 47c5b82a15..5d79827f0f 100644 --- a/tests/ref/lavfi/pixfmts_pad +++ b/tests/ref/lavfi/pixfmts_pad @@ -16,7 +16,7 @@ yuv422p 3e0d822c11c716e7636387b1bf27c5ff yuv440p 225dd7fbc8cceb24c26b765187d43a9e yuv444p 45484f0411d336ce94636da0395f4692 yuva420p 919722724765dc3a716c38fa53b20580 -yuva422p bdb4a25a087cd83cac72ac4a9f1d299e +yuva422p 4d090fc37b5c653d38fa649dba7203d1 yuva444p a6193323b438fbce3a7e0203eff020ec yuvj420p 4f20e2799966c21a9d9e0788b0956925 yuvj422p e4d84b0683f77a76f1c17d976eff127c diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 3f97bd67c1..60a977efc7 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -62,7 +62,7 @@ yuv444p16le a0c5d3c7bf3f181db503cf8e450d1335 yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 yuva420p 8673a9131fb47de69788863f93a50eb7 -yuva422p 3c76ebeca0a7d3aa5f8e31ef80a86ffe +yuva422p c576dc435c7a22f0d17a7aec151ce26f yuva444p d7a2d5bcdfb762f449a810856d1251fe yuvj420p 30427bd6caf5bda93a173dbebe759e09 yuvj422p fc8288f64fd149573f73cf8da05d8e6d diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 4902d0afcf..2b4f85bcb5 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -62,7 +62,7 @@ yuv444p16le 8e83323cf102d6c823a03ae8a7b7e033 yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a yuv444p9le 85aef13a654953d3455d89770b0d74bd yuva420p c705d1cf061d8c6580ac690b55f92276 -yuva422p 6aed0ea657ed51cc047a4fbdd981aec8 +yuva422p 5e2c7a58eb243892c9a262947ab9b937 yuva444p 1ea8e96f8e962b09ac20a414c003ea65 yuvj420p 41fd02b204da0ab62452cd14b595e2e4 yuvj422p 7f6ca9bc1812cde02036d7d29a7cce43 -- cgit v1.2.3