diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:06:36 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:06:54 +0000 |
| commit | 113c25653320b0a72548d07242a3cc4ce086f02d (patch) | |
| tree | 1d58d7fe422db5697b96a1ef026abee80a119573 /libavutil/cpu.c | |
| parent | 2f78be00194be4d6dbb1de1e7bee428b63a21fea (diff) | |
| parent | 60f0fde3092d18d4d36555962c192af8691a099c (diff) | |
| download | ffmpeg-113c25653320b0a72548d07242a3cc4ce086f02d.tar.gz | |
Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'
This commit is a no-op.
* commit '60f0fde3092d18d4d36555962c192af8691a099c':
libx264: Make sure to preserve default option values
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/cpu.c')
0 files changed, 0 insertions, 0 deletions