diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:41:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:43:45 +0200 |
| commit | 3fb754712c8a680f32f9cba43d6176891ea3d240 (patch) | |
| tree | 5f346cc800122f9dacf05bc668b8bcb62b2fa009 /tests/ffserver-regression.sh | |
| parent | e5294f407a81c2088ce21b5ae35469aff38ce100 (diff) | |
| parent | 428b629eb28907738ae98331b9f6c25cc9a8f3c8 (diff) | |
| download | ffmpeg-3fb754712c8a680f32f9cba43d6176891ea3d240.tar.gz | |
Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2
* commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8':
vp9: Read the frame size as unsigned
Conflicts:
libavcodec/vp9.c
See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver-regression.sh')
0 files changed, 0 insertions, 0 deletions