diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-09 13:50:16 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-09 13:57:43 +0200 |
| commit | f512e4a39037ef798ec78170f734c7733abe3231 (patch) | |
| tree | 659966d806a60518b7b33b5828326de4da52f2b5 /libavcodec/h264.h | |
| parent | 0f2654c9a3eac1fd856a393047aacc4575620ecd (diff) | |
| parent | 61f168ae348f94f39e7afc6971654455a5de0e4d (diff) | |
| download | ffmpeg-f512e4a39037ef798ec78170f734c7733abe3231.tar.gz | |
Merge commit '61f168ae348f94f39e7afc6971654455a5de0e4d'
* commit '61f168ae348f94f39e7afc6971654455a5de0e4d':
h264: factor out setting the parameter sets for a frame
Michael's changes on top of the merge undo parts of the original diff
that are not factorization:
"The call point is left where it was before. Such a change should be in
a separate commit and has multiple issues, one being null pointer
dereferences the other is that some safety checks would become
conditional.
I tried to split the PPS init between the new and old functions
similarly to the SPS code."
Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 078105cf80..ed8498aee4 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -413,6 +413,8 @@ typedef struct H264SliceContext { } ref_modifications[2][32]; int nb_ref_modifications[2]; + unsigned int pps_id; + const uint8_t *intra_pcm_ptr; int16_t *dc_val_base; |