Port pred8x8l_horizontal_down_mmxext (H.264 intra prediction) from x264

[ffmpeg] / libavcodec / pcxenc.c

diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c
index 17fa3c2f472cbd6d2164d7aea7afe17bcc36bdc2..e01727f3e7c8671aef9f21123ad15456d6dc2632 100644 (file)
--- a/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@ -21,7 +21,7 @@
 
 /**
  * PCX image encoder
- * @file libavcodec/pcxenc.c
+ * @file
  * @author Daniel Verkamp
  * @sa http://www.qzx.com/pc-gpe/pcx.txt
  */
@@ -33,7 +33,7 @@ typedef struct PCXContext {
     AVFrame picture;
 } PCXContext;
 
-static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF };
+static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF };
 
 static av_cold int pcx_encode_init(AVCodecContext *avctx)
 {
@@ -191,7 +191,7 @@ static int pcx_encode_frame(AVCodecContext *avctx,
 
 AVCodec pcx_encoder = {
     "pcx",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PCX,
     sizeof(PCXContext),
     pcx_encode_init,