diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-12 16:06:58 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-12 19:01:43 +0200 |
| commit | bd3fd467febe92300e0ebf8ff13c193f9236479a (patch) | |
| tree | e2a4382598405ce35492ec3c69e007e36f9b5e6c /libavcodec/h264.h | |
| parent | 65d5f32fd7d234a9b08e3743593de0a72af7c03c (diff) | |
| parent | c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8 (diff) | |
| download | ffmpeg-bd3fd467febe92300e0ebf8ff13c193f9236479a.tar.gz | |
Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
* commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 99262ae3dd..da8a92f47e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -648,17 +648,7 @@ typedef struct H264Context { uint16_t *slice_table_base; - // POC stuff - int poc_lsb; - int poc_msb; - int delta_poc_bottom; - int delta_poc[2]; - int frame_num; - int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 - int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 - int frame_num_offset; ///< for POC type 2 - int prev_frame_num_offset; ///< for POC type 2 - int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 + H264POCContext poc; /** * frame_num for frames or 2 * frame_num + 1 for field pics. @@ -1188,7 +1178,6 @@ void ff_h264_unref_picture(H264Context *h, H264Picture *pic); int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); -int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl); #define SLICE_SINGLETHREAD 1 |