summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-17 12:45:28 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-17 12:45:28 +0100
commitbc66451e5e903698ee0500faf04c1214f3dd157f (patch)
tree4c9413f9161f50440fd102de9f40bd3f06fa2bfa /libavcodec/h264.h
parent9d1fb9ef313e0fb709ac4c35c7bf00264963fd85 (diff)
parent741b494fa8cd28a7d096349bac183893c236e3f9 (diff)
downloadffmpeg-streaming-bc66451e5e903698ee0500faf04c1214f3dd157f.zip
ffmpeg-streaming-bc66451e5e903698ee0500faf04c1214f3dd157f.tar.gz
Merge commit '741b494fa8cd28a7d096349bac183893c236e3f9'
* commit '741b494fa8cd28a7d096349bac183893c236e3f9': h264: eliminate default_ref_list Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b3d08c3..5d9aecd 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -669,7 +669,6 @@ typedef struct H264Context {
*/
int max_pic_num;
- H264Ref default_ref_list[2][32]; ///< base reference list for all slices of a coded picture
H264Picture *short_ref[32];
H264Picture *long_ref[32];
H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size?
@@ -714,8 +713,6 @@ typedef struct H264Context {
enum AVPictureType pict_type;
- int last_slice_type;
- unsigned int last_ref_count[2];
/** @} */
/**
@@ -897,11 +894,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);
OpenPOWER on IntegriCloud