aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-04 15:35:15 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-04 15:37:59 +0100
commit17edc370b2e0656ed827b20a865347a9c87cbc1a (patch)
tree7d14fd5c08a87594d99f2e4680feeb49ac1611a4 /libavformat
parent2754514787838d00753c27e044494a49608b7e4d (diff)
downloadffmpeg-17edc370b2e0656ed827b20a865347a9c87cbc1a.tar.gz
yuv4 libquicktime packed 4:2:0 encoder and decoder.
Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c1
-rw-r--r--libavformat/riff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 1e7b79c288..8f898343d6 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -94,6 +94,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 4:4:4 */
{ CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */
{ CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */
+ { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */
{ CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
diff --git a/libavformat/riff.c b/libavformat/riff.c
index aa86462636..cd2c9a0f0c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -201,6 +201,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
{ CODEC_ID_V308, MKTAG('v', '3', '0', '8') },
{ CODEC_ID_V410, MKTAG('v', '4', '1', '0') },
+ { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
{ CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },