diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 21:05:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 21:08:45 +0100 |
| commit | fc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22 (patch) | |
| tree | 9bb438dc1e4d65df4f20bd0fce15ed3f3126c956 /doc/ffserver.conf | |
| parent | ab8d9fe9b84c92b21354a7e5df3b61a28477f576 (diff) | |
| parent | 60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed (diff) | |
| download | ffmpeg-fc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22.tar.gz | |
Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'
* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
libx265: Write global extradata when requested
See: dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions