diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 15:17:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 15:17:42 -0300 |
| commit | f1464418844040a96ad031bc7c31544f4bf30bd3 (patch) | |
| tree | 395a644768e01bc663a00be797119c302929b58e | |
| parent | 4391d6cb8180f1261e38a588b7c4ffc457531cb2 (diff) | |
| parent | 3cae7f8b9baaf43789490b676d8f5825f2e1bc2c (diff) | |
| download | ffmpeg-f1464418844040a96ad031bc7c31544f4bf30bd3.tar.gz | |
Merge commit '3cae7f8b9baaf43789490b676d8f5825f2e1bc2c'
* commit '3cae7f8b9baaf43789490b676d8f5825f2e1bc2c':
cbs: Add some read/write tests
http: Reset compressed header flag when starting to read a request
cbs_h264: Fix writing streams with auxiliary pictures
smacker: fix integer overflow with pts_inc
smacker: return meaningful error codes on failure
pixdesc: Add API to map color property names to enum values
This commit is a noop, see
6f15f1cdc85350b7adcfb7c50eedb5ecde6a384a
547b8aeed442dbb3b2cf4a2c507c63e869795cfd
7ed47e97297fd5ef473d0cc93f0455adbadaac83
624d4739dbfc950ee756e83ae187f97dc82d10c9
6743351558001764d662bb52b9a3e0bbb63366d6
809b0402dc916b876dfdd6bb9c88f171cf3e77c0
Merged-by: James Almer <jamrial@gmail.com>
0 files changed, 0 insertions, 0 deletions