aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-02-08 12:38:42 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-02-09 19:19:43 +0100
commit331a33d74a0e8a543f511081fa9dd9a880e784f8 (patch)
tree409821ed9fd29fb583bac576cc15f67166e35687
parent43a69655699bb115df6c760e14dbe319ac38e0cd (diff)
downloadffmpeg-331a33d74a0e8a543f511081fa9dd9a880e784f8.tar.gz
nut: Add PAL8 support
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/raw.c1
-rw-r--r--libavformat/nut.c2
-rw-r--r--tests/ref/fate/filter-pixfmts-copy2
-rw-r--r--tests/ref/fate/filter-pixfmts-crop2
-rw-r--r--tests/ref/fate/filter-pixfmts-field2
-rw-r--r--tests/ref/fate/filter-pixfmts-hflip2
-rw-r--r--tests/ref/fate/filter-pixfmts-null2
-rw-r--r--tests/ref/fate/filter-pixfmts-scale2
-rw-r--r--tests/ref/fate/filter-pixfmts-vflip2
9 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 4f7417ae10..bfa2537b5a 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -154,6 +154,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) },
{ AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) },
{ AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) },
+ { AV_PIX_FMT_PAL8, MKTAG('P', 'A', 'L', 8 ) },
{ AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) },
{ AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') },
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 7d5f1ba56d..f4901e6c3a 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -168,6 +168,8 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('X', 'Y', 'Z' , 36 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(36 , 'Z' , 'Y', 'X') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('P', 'A', 'L', 8 ) },
+
{ AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'G', 'B', 0xBA) },
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index ead72909fe..7bab4b83ee 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -35,7 +35,7 @@ monob a6869bab4f6e64fe13dcab13b41775b3
monow 0404328f1838a6503371478a559ca20d
nv12 8e24feb2c544dc26a20047a71e4c27aa
nv21 335d85c9af6110f26ae9e187a82ed2cf
-pal8 d9a58fa1964ba9a3b902797b0b1af0ab
+pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be
rgb444be 115e5259b91f4a416546b09570347633
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index a93032341a..0b54641e83 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -33,7 +33,7 @@ gray16be 38f599da990224de86e3dc7a543121a9
gray16le 9ff7c866bd98def4e6c91542c1c45f80
nv12 92cda427f794374731ec0321ee00caac
nv21 1bcfc197f4fb95de85ba58182d8d2f69
-pal8 c89abc9660914b2e6c2e6f8c29e86503
+pal8 1f2cdc8e718f95c875dbc1034a688bfb
rgb0 736646b70dd9a0be22b8da8041e35035
rgb24 c5fbbf816bb2000f4d2914e335698ef5
rgb444be 44a33306889f7fa1a71ec831b860fd0a
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index e3df496f95..e599571a58 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -35,7 +35,7 @@ monob 599b938a6207de81bd96c902c2511676
monow 8486b94cd7c498b0effd33cb7e8e63df
nv12 16f7a46708ef25ebd0b72e47920cc11e
nv21 7294574037cc7f9373ef5695d8ebe809
-pal8 379b8c80f4422a353ad286f7120f2fb6
+pal8 0658c18dcd8d052d59dfbe23f5b368d9
rgb0 ca3fa6e865b91b3511c7f2bf62830059
rgb24 25ab271e26a5785be169578d99da5dd0
rgb444be a05fabc91e485ec02461be900cd72ef3
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index bd1481a3b4..98c165bad3 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -33,7 +33,7 @@ gray16be cf7294d9aa23e1b838692ec01ade587b
gray16le d91ce41e304419bcf32ac792f01bd64f
nv12 801e58f1be5fd0b5bc4bf007c604b0b4
nv21 9f10dfff8963dc327d3395af21f0554f
-pal8 cfe90d91bea5172babd97c3828270ea5
+pal8 5b7c77d99817b4f52339742a47de7797
rgb0 0092452f37d73da20193265ace0b7d57
rgb24 21571104e6091a689feabb7867e513dd
rgb444be 38d6d0e9aa15ce95f3fffcde8437632d
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index ead72909fe..7bab4b83ee 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -35,7 +35,7 @@ monob a6869bab4f6e64fe13dcab13b41775b3
monow 0404328f1838a6503371478a559ca20d
nv12 8e24feb2c544dc26a20047a71e4c27aa
nv21 335d85c9af6110f26ae9e187a82ed2cf
-pal8 d9a58fa1964ba9a3b902797b0b1af0ab
+pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be
rgb444be 115e5259b91f4a416546b09570347633
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 80e2e558e4..1e4503c2a3 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -35,7 +35,7 @@ monob 337d236f59b891b16dd17c5267cf874b
monow 3cb791057cf735930f97fe67e5125c45
nv12 b118d24a3653fe66e5d9e079033aef79
nv21 c74bb1c10dbbdee8a1f682b194486c4d
-pal8 28a5374b56a7d3e37f95ddb8469f14dd
+pal8 29e10892009b2cfe431815ec3052ed3b
rgb0 fbd27e98154efb7535826afed41e9bb0
rgb24 e022e741451e81f2ecce1c7240b93e87
rgb444be db52b9ecdf98479b693e3f4bd9e77bac
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 81d001d121..2c35a2382f 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -35,7 +35,7 @@ monob f51f07ba50f4398233106f0e81494170
monow ee414089983b5be0f76b9d962757d900
nv12 261ebe585ae2aa4e70d39a10c1679294
nv21 2909feacd27bebb080c8e0fa41795269
-pal8 e81c55915557563b46627b0911764578
+pal8 450b0155d0f2d5628bf95a442db5f817
rgb0 56a7ea69541bcd27bef6a5615784722b
rgb24 195e6dae1c3a488b9d3ceb7560d25d85
rgb444be d30742559618f871ef5543f602e35d04