X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh264.h;h=6d6629b043715c7fa24d02f73210a6af395aaf6e;hb=83df0a84a99d8291e5e1c5f7e2289cbd89107881;hp=b3d08c3d11958fe416a966cb6b91a83db383c6d7;hpb=6dce615ee24e5654ec2048eac461babc93da612f;p=ffmpeg diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b3d08c3d119..6d6629b0437 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -520,7 +520,7 @@ typedef struct H264SliceContext { * H264Context */ typedef struct H264Context { - AVClass *av_class; + const AVClass *class; AVCodecContext *avctx; VideoDSPContext vdsp; H264DSPContext h264dsp; @@ -669,7 +669,7 @@ typedef struct H264Context { */ int max_pic_num; - H264Ref default_ref_list[2][32]; ///< base reference list for all slices of a coded picture + H264Ref default_ref[2]; H264Picture *short_ref[32]; H264Picture *long_ref[32]; H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? @@ -714,8 +714,6 @@ typedef struct H264Context { enum AVPictureType pict_type; - int last_slice_type; - unsigned int last_ref_count[2]; /** @} */ /** @@ -897,11 +895,6 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); */ int ff_h264_alloc_tables(H264Context *h); -/** - * Fill the default_ref_list. - */ -int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl); - int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h);