set supported pixel formats for a few encoders (fixes crashes with grayscale)

Originally committed as revision 6303 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 3cfb76e..cf65d17 100644 (file)
--- 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 c987d84..443950c 100644 (file)
--- 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 20c9388..337d479 100644 (file)
--- 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 3f405af..b10cce6 100644 (file)
--- 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