diff options
| author | James Almer <jamrial@gmail.com> | 2017-12-27 21:09:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-27 21:11:10 -0300 |
| commit | 2f96190732d15510ba29471fa45d66841c0c3df1 (patch) | |
| tree | c05594df328b7906a39225b1e86f63af04db5e84 /libavcodec/sipr16k.c | |
| parent | aa6f43c2e959a960792f76d006b8699d733f258f (diff) | |
| parent | c6558e8840fbb2386bf8742e4d68dd6e067d262e (diff) | |
| download | ffmpeg-2f96190732d15510ba29471fa45d66841c0c3df1.tar.gz | |
Merge commit 'c6558e8840fbb2386bf8742e4d68dd6e067d262e'
* commit 'c6558e8840fbb2386bf8742e4d68dd6e067d262e':
x264: Support version 153
See
2a111c99a60fdf4fe5eea2b073901630190c6c93
7e60c74329353db28db00552028bc88cd2a52346
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions