diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 21:43:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 21:46:40 +0200 |
| commit | 883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c (patch) | |
| tree | 7a11e3ae930a8d765adc61d11bd52cb9fc8cc461 /libavcodec/smc.c | |
| parent | dd3bfe3cc1ca26d0fff3a3baf61a40207032143f (diff) | |
| parent | 55f03d872640175a00bfa262da4652b7312b905f (diff) | |
| download | ffmpeg-883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c.tar.gz | |
Merge commit '55f03d872640175a00bfa262da4652b7312b905f'
* commit '55f03d872640175a00bfa262da4652b7312b905f':
hlsenc: Add parameter -hls_allow_cache
Conflicts:
doc/muxers.texi
libavformat/hlsenc.c
libavformat/version.h
See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smc.c')
0 files changed, 0 insertions, 0 deletions