diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:24:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:33:02 +0100 |
| commit | ffd77f94a26be22b8ead3178ceec3ed39e68abc5 (patch) | |
| tree | 0e7982c66986de2d8aa41102610a87866e042bec /libavcodec/h264.h | |
| parent | 0626211b561f299971a96b7bd1ee6f8a6d6735c8 (diff) | |
| parent | f51d0f39c0fb3470d6b186974109428da91f1d1b (diff) | |
| download | ffmpeg-ffd77f94a26be22b8ead3178ceec3ed39e68abc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Split h264 slice decoding from nal decoding
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7262239747..70539bbd58 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -854,6 +854,8 @@ int ff_h264_decode_mb_cabac(H264Context *h); void ff_h264_init_cabac_states(H264Context *h); +void h264_init_dequant_tables(H264Context *h); + void ff_h264_direct_dist_scale_factor(H264Context *const h); void ff_h264_direct_ref_list_init(H264Context *const h); void ff_h264_pred_direct_motion(H264Context *const h, int *mb_type); @@ -1078,9 +1080,28 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h) 0x0001000100010001ULL)); } +int ff_h264_field_end(H264Context *h, int in_setup); + +int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); +void ff_h264_unref_picture(H264Context *h, H264Picture *pic); + +int ff_h264_context_init(H264Context *h); +int ff_h264_set_parameter_from_sps(H264Context *h); + void ff_h264_draw_horiz_band(H264Context *h, int y, int height); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); int ff_pred_weight_table(H264Context *h); int ff_set_ref_count(H264Context *h); +int ff_h264_decode_slice_header(H264Context *h, H264Context *h0); +int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count); +int ff_h264_update_thread_context(AVCodecContext *dst, + const AVCodecContext *src); + +void ff_h264_flush_change(H264Context *h); + +void ff_h264_free_tables(H264Context *h, int free_rbsp); + +void ff_h264_set_erpic(ERPicture *dst, H264Picture *src); + #endif /* AVCODEC_H264_H */ |