1 files changed, 33 insertions, 6 deletions
diff --git a/src/libffmpeg/libavcodec/avcodec.h b/src/libffmpeg/libavcodec/avcodec.h
index 8e2fc3d58..f88184d50 100644
--- a/src/libffmpeg/libavcodec/avcodec.h
+++ b/src/libffmpeg/libavcodec/avcodec.h
@@ -5,8 +5,8 @@
 
 #define LIBAVCODEC_VERSION_INT 0x000406
 #define LIBAVCODEC_VERSION     "0.4.6"
-#define LIBAVCODEC_BUILD       4638
-#define LIBAVCODEC_BUILD_STR   "4638"
+#define LIBAVCODEC_BUILD       4639
+#define LIBAVCODEC_BUILD_STR   "4639"
 
 enum CodecID {
     CODEC_ID_NONE, 
@@ -34,6 +34,7 @@ enum CodecID {
     CODEC_ID_WMAV2,
     CODEC_ID_MACE3,
     CODEC_ID_MACE6,
+    CODEC_ID_HUFFYUV,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE,
@@ -68,7 +69,14 @@ enum PixelFormat {
     PIX_FMT_RGBA32,
     PIX_FMT_BGRA32,
     PIX_FMT_YUV410P,
-    PIX_FMT_YUV411P
+    PIX_FMT_YUV411P,
+    PIX_FMT_RGB565,
+    PIX_FMT_RGB555,
+//    PIX_FMT_RGB5551,
+    PIX_FMT_BGR565,
+    PIX_FMT_BGR555,
+//    PIX_FMT_GBR565,
+//    PIX_FMT_GBR555
 };
 
 /* currently unused, may be used if 24/32 bits samples ever supported */
@@ -770,10 +778,27 @@ typedef struct AVCodecContext {
      * CPU features (i.e. MMX, SSE. ...)
      */
      unsigned dsp_mask;
+
+    /**
+     * bits per sample/pixel from the demuxer (needed for huffyuv)
+     * encoding; set by lavc
+     * decoding: set by user
+     */
+     int bits_per_sample;
+    
+    /**
+     * prediction method (needed for huffyuv)
+     * encoding; set by user
+     * decoding: unused
+     */
+     int prediction_method;
+#define FF_PRED_LEFT   0
+#define FF_PRED_PLANE  1
+#define FF_PRED_MEDIAN 2
 } AVCodecContext;
 
 typedef struct AVCodec {
-    char *name;
+    const char *name;
     int type;
     int id;
     int priv_data_size;
@@ -810,6 +835,7 @@ extern AVCodec msmpeg4v2_encoder;
 extern AVCodec msmpeg4v3_encoder;
 extern AVCodec wmv1_encoder;
 extern AVCodec wmv2_encoder;
+extern AVCodec huffyuv_encoder;
 
 extern AVCodec h263_decoder;
 extern AVCodec mpeg4_decoder;
@@ -831,6 +857,7 @@ extern AVCodec mp2_decoder;
 extern AVCodec mp3_decoder;
 extern AVCodec mace3_decoder;
 extern AVCodec mace6_decoder;
+extern AVCodec huffyuv_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \
@@ -1021,8 +1048,8 @@ typedef enum {
 int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout);
 
 /* memory */
-void *av_malloc(int size);
-void *av_mallocz(int size);
+void *av_malloc(unsigned int size);
+void *av_mallocz(unsigned int size);
 void av_free(void *ptr);
 void __av_freep(void **ptr);
 #define av_freep(p) __av_freep((void **)(p))