comparison h264.h @ 11341:a26f51d0bb63 libavcodec

move svq3 specific fields to the end of the context

11340:f5ebc14d90f0

    int mb_uvlinesize;

    int emu_edge_width;
    int emu_edge_height;

    int halfpel_flag;
    int thirdpel_flag;

    int unknown_svq3_flag;
    int next_slice_index;

    SPS *sps_buffers[MAX_SPS_COUNT];
    SPS sps; ///< current sps

    PPS *pps_buffers[MAX_PPS_COUNT];
    /**

    int last_slice_type;
    /** @} */

    int mb_xy;

    uint32_t svq3_watermark_key;

    /**
     * pic_struct in picture timing SEI message
     */
    SEI_PicStructType sei_pic_struct;

    int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag

    // Timestamp stuff
    int sei_buffering_period_present;  ///< Buffering period SEI flag
    int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs
}H264Context;


extern const uint8_t ff_h264_chroma_qp[52];

11341:a26f51d0bb63

    int mb_uvlinesize;

    int emu_edge_width;
    int emu_edge_height;

    SPS *sps_buffers[MAX_SPS_COUNT];
    SPS sps; ///< current sps

    PPS *pps_buffers[MAX_PPS_COUNT];
    /**

    int last_slice_type;
    /** @} */

    int mb_xy;

    /**
     * pic_struct in picture timing SEI message
     */
    SEI_PicStructType sei_pic_struct;

    int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag

    // Timestamp stuff
    int sei_buffering_period_present;  ///< Buffering period SEI flag
    int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs

    //SVQ3 specific fields
    int halfpel_flag;
    int thirdpel_flag;
    int unknown_svq3_flag;
    int next_slice_index;
    uint32_t svq3_watermark_key;
}H264Context;


extern const uint8_t ff_h264_chroma_qp[52];