diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 21:23:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 21:24:55 +0100 |
| commit | 5d39ec2188e8244851f4e079029704677bbf4505 (patch) | |
| tree | 9bb438dc1e4d65df4f20bd0fce15ed3f3126c956 /doc/ffserver.conf | |
| parent | fc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22 (diff) | |
| parent | 21a561176e5ed44208a4438a1b0c28a91dd6f4b6 (diff) | |
| download | ffmpeg-5d39ec2188e8244851f4e079029704677bbf4505.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx265: Only use one memcpy for headers
See: ecb5b9c098009787e02f6de9e2d3e1786531c2f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions