Revision 0da71265 libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
49 49
    CODEC_ID_MACE6,
50 50
    CODEC_ID_HUFFYUV,
51 51
    CODEC_ID_CYUV,
52
    CODEC_ID_H264,
52 53

  
53 54
    /* various pcm "codecs" */
54 55
    CODEC_ID_PCM_S16LE,
......
210 211
    int key_frame;\
211 212
\
212 213
    /**\
213
     * picture type of the frame, see ?_TYPE below\
214
     * picture type of the frame, see ?_TYPE below.\
214 215
     * - encoding: set by lavc for coded_picture (and set by user for input)\
215 216
     * - decoding: set by lavc\
216 217
     */\
......
320 321
#define FF_P_TYPE 2 // Predicted
321 322
#define FF_B_TYPE 3 // Bi-dir predicted
322 323
#define FF_S_TYPE 4 // S(GMC)-VOP MPEG4
324
#define FF_SI_TYPE 5
325
#define FF_SP_TYPE 6
323 326

  
327
/**
328
 * Audio Video Frame.
329
 */
324 330
typedef struct AVFrame {
325 331
    FF_COMMON_FRAME
326 332
} AVFrame;
......
906 912
#define FF_DEBUG_STARTCODE 0x00000100
907 913
#define FF_DEBUG_PTS       0x00000200
908 914
#define FF_DEBUG_ER        0x00000400
915
#define FF_DEBUG_MMCO      0x00000800
909 916
    
910 917
    /**
911 918
     * error.
......
1149 1156
extern AVCodec wmv1_encoder;
1150 1157
extern AVCodec wmv2_encoder;
1151 1158
extern AVCodec huffyuv_encoder;
1159
extern AVCodec h264_encoder;
1152 1160

  
1153 1161
extern AVCodec h263_decoder;
1154 1162
extern AVCodec mpeg4_decoder;
......
1174 1182
extern AVCodec huffyuv_decoder;
1175 1183
extern AVCodec oggvorbis_decoder;
1176 1184
extern AVCodec cyuv_decoder;
1185
extern AVCodec h264_decoder;
1177 1186

  
1178 1187
/* pcm codecs */
1179 1188
#define PCM_CODEC(id, name) \

Also available in: Unified diff