Skip to content

Commit e347b4f

Browse files
committed
avformat/riff: map Y410 fourcc to RAWVIDEO decoder
md5 values change because the nut container now reports rawvideo as encoder and Y410 as codec type instead of the bogus RGB[15]. Signed-off-by: James Almer <[email protected]>
1 parent b0ea76c commit e347b4f

13 files changed

+13
-11
lines changed

libavcodec/raw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = {
7373
{ AV_PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
7474
{ AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
7575
{ AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */
76+
{ AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') },
7677

7778
/* nut */
7879
{ AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },

libavformat/riff.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
222222
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
223223
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
224224
{ AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') },
225+
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '0') },
225226
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') },
226227
{ AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') },
227228
{ AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') },

tests/ref/fate/filter-pixdesc-xv30le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pixdesc-xv30le fb76a14d6d5cf3a0b48f30b2fb59becd
1+
pixdesc-xv30le 701d821940e3f837864393e1c7878843

tests/ref/fate/filter-pixfmts-copy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee
105105
vyu444 93912234400a4373b1a6b5c4e4b1a4ef
106106
x2bgr10le 550c0d190cf695afa4eaacb644db6b75
107107
x2rgb10le c1e3ac21be04a16bb157b22784524520
108-
xv30le c14b5a953bf3be56346f66ca174a5b1b
108+
xv30le 718bf036d13f9f1ea8804c2658dd53fa
109109
xv36le 6b8e46832aa8537a774e93dd7503c700
110110
xyz12be a1ef56bf746d71f59669c28e48fc8450
111111
xyz12le 831ff03c1ba4ef19374686f16a064d8c

tests/ref/fate/filter-pixfmts-crop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ vuyx 615241c5406eb556fca0ad8606c23a02
102102
vyu444 5d976b25782ff69e4b3b18453fa1447b
103103
x2bgr10le 84de725b85662c362862820dc4a309aa
104104
x2rgb10le f4265aca7a67dbfa9354370098ca6f33
105-
xv30le a9edb820819b900a4a897fee4562a4fb
105+
xv30le efebde9ca614024cd7ed95c7c02e9281
106106
xv36le 567af630bf0209e026e0909b3ca9c436
107107
xyz12be cb4571f9aaa7b59f999ef327276104b7
108108
xyz12le cd6aae8d26b18bdb4b9d068586276d91

tests/ref/fate/filter-pixfmts-field

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ vuyx 3d02eeab336d0a8106f6fdd91be61073
105105
vyu444 b139fb4ddaef12a7542a68277211efa7
106106
x2bgr10le dbe21538d7cb1744914f6bd46ec09b55
107107
x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677
108-
xv30le e940366c78efc9e292e9de28cf04dba9
108+
xv30le 298f6f14c5bfc18587cd1c3225287a39
109109
xv36le e05a99fc3edc8f26cb2dbd287c0a0fcf
110110
xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437
111111
xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5

tests/ref/fate/filter-pixfmts-fieldorder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ vuyx 9e4480c5fcb7c091ec3e517420764ef3
9494
vyu444 3ddab207d561a3ee5efae09e504207f2
9595
x2bgr10le 86474d84f26c5c51d6f75bf7e1de8da8
9696
x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676
97-
xv30le 25aac48128d94010a3660839500caee5
97+
xv30le bfd6693b5e995f65b130d963a972c34e
9898
xv36le 1f054a1ba4c8f8875ffd15d3d1baccba
9999
xyz12be 15f5cda71de5fef9cec5e75e3833b6bc
100100
xyz12le 7be6c8781f38c21a6b8f602f62ca31e6

tests/ref/fate/filter-pixfmts-hflip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ vuyx f1d087284fb1556d76e6def5f94bf273
102102
vyu444 7b72337f92a7223fd115265e2f769276
103103
x2bgr10le 827cc659f29378e00c5a7d2c0ada8f9a
104104
x2rgb10le d4a8189b65395a88d0a38a7053f3359f
105-
xv30le 072aa2b61ce1e764f9d1957e8abee9a9
105+
xv30le 79c6fe0c957d4fdc7bd6d056b13d7ceb
106106
xv36le 6e9c3d2334f9fe2a0e6156615e53e272
107107
xyz12be 25f90259ff8a226befdaec3dfe82996e
108108
xyz12le 926c0791d59aaff61b2778e8ada3316d

tests/ref/fate/filter-pixfmts-il

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ vuyx 4251d94ee49e6a3cc1c10c09cd331308
104104
vyu444 50e9e24a38afc81541a536d06aab5ebe
105105
x2bgr10le 135acaff8318cf9861bb0f7849a9e5e9
106106
x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94
107-
xv30le 7f6414a3fc700380025c29812e8376a9
107+
xv30le b18e762bfc505cdd51bac3401c019613
108108
xv36le cfebfdccb16087207bab0b1909c9d85c
109109
xyz12be 7c7d54c55f136cbbc50b18029f3be0b3
110110
xyz12le 090ba6b1170baf2b1358b43b971d33b0

tests/ref/fate/filter-pixfmts-null

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee
105105
vyu444 93912234400a4373b1a6b5c4e4b1a4ef
106106
x2bgr10le 550c0d190cf695afa4eaacb644db6b75
107107
x2rgb10le c1e3ac21be04a16bb157b22784524520
108-
xv30le c14b5a953bf3be56346f66ca174a5b1b
108+
xv30le 718bf036d13f9f1ea8804c2658dd53fa
109109
xv36le 6b8e46832aa8537a774e93dd7503c700
110110
xyz12be a1ef56bf746d71f59669c28e48fc8450
111111
xyz12le 831ff03c1ba4ef19374686f16a064d8c

0 commit comments

Comments
 (0)