Revision 11f18faf libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
5 5

  
6 6
#define LIBAVCODEC_VERSION_INT 0x000406
7 7
#define LIBAVCODEC_VERSION     "0.4.6"
8
#define LIBAVCODEC_BUILD       4638
9
#define LIBAVCODEC_BUILD_STR   "4638"
8
#define LIBAVCODEC_BUILD       4639
9
#define LIBAVCODEC_BUILD_STR   "4639"
10 10

  
11 11
enum CodecID {
12 12
    CODEC_ID_NONE, 
......
34 34
    CODEC_ID_WMAV2,
35 35
    CODEC_ID_MACE3,
36 36
    CODEC_ID_MACE6,
37
    CODEC_ID_HUFFYUV,
37 38

  
38 39
    /* various pcm "codecs" */
39 40
    CODEC_ID_PCM_S16LE,
......
770 771
     * CPU features (i.e. MMX, SSE. ...)
771 772
     */
772 773
     unsigned dsp_mask;
774

  
775
    /**
776
     * bits per sample/pixel from the demuxer (needed for huffyuv)
777
     * encoding; set by lavc
778
     * decoding: set by user
779
     */
780
     int bits_per_sample;
781
    
782
    /**
783
     * prediction method (needed for huffyuv)
784
     * encoding; set by user
785
     * decoding: unused
786
     */
787
     int prediction_method;
788
#define FF_PRED_LEFT   0
789
#define FF_PRED_PLANE  1
790
#define FF_PRED_MEDIAN 2
773 791
} AVCodecContext;
774 792

  
775 793
typedef struct AVCodec {
......
810 828
extern AVCodec msmpeg4v3_encoder;
811 829
extern AVCodec wmv1_encoder;
812 830
extern AVCodec wmv2_encoder;
831
extern AVCodec huffyuv_encoder;
813 832

  
814 833
extern AVCodec h263_decoder;
815 834
extern AVCodec mpeg4_decoder;
......
831 850
extern AVCodec mp3_decoder;
832 851
extern AVCodec mace3_decoder;
833 852
extern AVCodec mace6_decoder;
853
extern AVCodec huffyuv_decoder;
834 854

  
835 855
/* pcm codecs */
836 856
#define PCM_CODEC(id, name) \

Also available in: Unified diff