aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-09-20 21:17:37 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-09-20 21:17:37 +0000
commitc3e462a8ca8127acacd0848c2e6ea4a45e628cd7 (patch)
tree2099345f730ef8a56e97941ff963cc5dc7afc64f
parent56f68a4112ccb909b96981d4128a3e81eec212e2 (diff)
downloadffmpeg-c3e462a8ca8127acacd0848c2e6ea4a45e628cd7.tar.gz
set supported pixel formats for a few encoders (fixes crashes with grayscale)
Originally committed as revision 6303 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/asv1.c2
-rw-r--r--libavcodec/ffv1.c1
-rw-r--r--libavcodec/h261.c1
-rw-r--r--libavcodec/wmv2.c1
4 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 3cfb76e65e..cf65d172cb 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -632,6 +632,7 @@ AVCodec asv1_encoder = {
encode_init,
encode_frame,
//encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
};
AVCodec asv2_encoder = {
@@ -642,6 +643,7 @@ AVCodec asv2_encoder = {
encode_init,
encode_frame,
//encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
};
#endif //CONFIG_ENCODERS
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index c987d84f6f..443950cc00 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1027,5 +1027,6 @@ AVCodec ffv1_encoder = {
encode_init,
encode_frame,
common_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGBA32, -1},
};
#endif
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 20c9388cb4..337d479cbd 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -1026,6 +1026,7 @@ AVCodec h261_encoder = {
MPV_encode_init,
MPV_encode_picture,
MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
};
#endif
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 3f405af4f9..b10cce60c9 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -848,5 +848,6 @@ AVCodec wmv2_encoder = {
wmv2_encode_init,
MPV_encode_picture,
MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, -1},
};
#endif