aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorami_stuff <amiUNDERSCOREstuff@o2.pl>2011-04-25 00:20:27 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-25 00:44:48 +0200
commit3e1c59ebc642831395bb5bcdc763520722679a6c (patch)
treee14ca8c37a136ca2e6a0c7836ea8600b57f69512
parent9a962f30556f8890a09cd668a9fe806ebac54206 (diff)
downloadffmpeg-3e1c59ebc642831395bb5bcdc763520722679a6c.tar.gz
Support fourcc auv2.
Fixes ticket #101.
-rw-r--r--libavcodec/raw.c1
-rw-r--r--libavformat/riff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 26b4df6d57..e607148a2b 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -61,6 +61,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */
{ PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') },
{ PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
+ { PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') },
{ PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
{ PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
{ PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e884780b76..6b093b2683 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -181,6 +181,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', 'B') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'V', '9') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
+ { CODEC_ID_RAWVIDEO, MKTAG('a', 'u', 'v', '2') },
{ CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
{ CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') },
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') },