diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 17:31:44 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 17:32:05 +0200 |
| commit | 2aff557c6acbce2b2b604c6c620c66c892260062 (patch) | |
| tree | 700012d0c51c5363e67fb7511a5258ba138ce73d /libavcodec/h264.h | |
| parent | 89cccfc905f7fdd94a9c2c099f01790441f71ce0 (diff) | |
| parent | ed9a20ebe4a89de119ea97bdccf688ece8c6648c (diff) | |
| download | ffmpeg-2aff557c6acbce2b2b604c6c620c66c892260062.tar.gz | |
Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-new
* commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c':
h264: split reading the ref list modifications and actually building the ref list
ref_modifications.val are read as u32 instead of u8 in FFmpeg.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 50fd45a741..2544e9d357 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -406,6 +406,11 @@ typedef struct H264SliceContext { H264Ref ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. * Reordered version of default_ref_list * according to picture reordering in slice header */ + struct { + uint8_t op; + uint32_t val; + } ref_modifications[2][32]; + int nb_ref_modifications[2]; const uint8_t *intra_pcm_ptr; int16_t *dc_val_base; @@ -714,7 +719,8 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); */ int ff_h264_alloc_tables(H264Context *h); -int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); +int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); +int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** |