Revision 755bfeab libavcodec/mpegvideo.h

View differences:

libavcodec/mpegvideo.h
133 133
#define IS_ACPRED(a)     ((a)&MB_TYPE_ACPRED)
134 134
#define IS_QUANT(a)      ((a)&MB_TYPE_QUANT)
135 135
#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0<<((part)+2*(list))))
136
#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0|MB_TYPE_P1L0)<<(2*(list)))) ///< does this mb use listX, note doesnt work if subMBs
136
#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0|MB_TYPE_P1L0)<<(2*(list)))) ///< does this mb use listX, note does not work if subMBs
137 137
#define HAS_CBP(a)        ((a)&MB_TYPE_CBP)
138 138

  
139 139
    int field_poc[2];           ///< h264 top/bottom POC
......
161 161
typedef struct MotionEstContext{
162 162
    AVCodecContext *avctx;
163 163
    int skip;                          ///< set if ME is skipped for the current MB
164
    int co_located_mv[4][2];           ///< mv from last p frame for direct mode ME
164
    int co_located_mv[4][2];           ///< mv from last P-frame for direct mode ME
165 165
    int direct_basis_mv[4][2];
166
    uint8_t *scratchpad;               ///< data area for the me algo, so that the ME doesnt need to malloc/free
166
    uint8_t *scratchpad;               ///< data area for the ME algo, so that the ME does not need to malloc/free
167 167
    uint8_t *best_mb;
168 168
    uint8_t *temp_mb[2];
169 169
    uint8_t *temp;
......
248 248

  
249 249
    /* sequence parameters */
250 250
    int context_initialized;
251
    int input_picture_number;  ///< used to set pic->display_picture_number, shouldnt be used for/by anything else
252
    int coded_picture_number;  ///< used to set pic->coded_picture_number, shouldnt be used for/by anything else
251
    int input_picture_number;  ///< used to set pic->display_picture_number, should not be used for/by anything else
252
    int coded_picture_number;  ///< used to set pic->coded_picture_number, should not be used for/by anything else
253 253
    int picture_number;       //FIXME remove, unclear definition
254 254
    int picture_in_gop_number; ///< 0-> first pic in gop, ...
255 255
    int b_frames_since_non_b;  ///< used for encoding, relative to not yet reordered input

Also available in: Unified diff