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 /libswresample/audioconvert.c | |
| 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 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions