diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 03:13:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 03:13:05 +0200 |
| commit | be8f96e5eb3c79fdeb30933db49ca1e7e427f9bb (patch) | |
| tree | c66207bdb68b258026535e131759f076930324c7 /doc | |
| parent | e2760de60514b949c0a5584d797d933f711f5b14 (diff) | |
| parent | 34e2ce5dde073244ccb2b62f930e96fe612690f7 (diff) | |
| download | ffmpeg-be8f96e5eb3c79fdeb30933db49ca1e7e427f9bb.tar.gz | |
Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'
* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
hlsenc: Set the default codecs to AAC and H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions