diff options
author | Ivan Schreter <schreter@gmx.net> | 2009-02-18 23:25:59 +0000 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-02-18 23:25:59 +0000 |
commit | 24a414e0fa42a0da5b3ecc80a8d5b281ddefdb24 (patch) | |
tree | 01ec415a5d5e050146b58aa653820e3e5c9e157d /libavcodec | |
parent | 15239b7fcc09ac520f977851cae8df12d5c361ec (diff) | |
download | ffmpeg-24a414e0fa42a0da5b3ecc80a8d5b281ddefdb24.tar.gz |
Store CPB count in the context.
Patch by Ivan Schreter, schreter gmx net
Originally committed as revision 17439 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264.c | 1 | ||||
-rw-r--r-- | libavcodec/h264.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 29493a3472..b64a527677 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6925,6 +6925,7 @@ static inline int decode_hrd_parameters(H264Context *h, SPS *sps){ sps->cpb_removal_delay_length = get_bits(&s->gb, 5) + 1; sps->dpb_output_delay_length = get_bits(&s->gb, 5) + 1; sps->time_offset_length = get_bits(&s->gb, 5); + sps->cpb_cnt = cpb_count; return 0; } diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 43201d32ec..4a77d25d7d 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -179,6 +179,7 @@ typedef struct SPS{ int vcl_hrd_parameters_present_flag; int pic_struct_present_flag; int time_offset_length; + int cpb_cnt; ///< See H.264 E.1.2 int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 +1 int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1 int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1 |