diff options
author | Clément Bœsch <u@pkh.me> | 2017-05-20 16:52:10 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-05-20 16:53:36 +0200 |
commit | e815111367cba1ec168ae080a6503e5b3eb326bf (patch) | |
tree | 3be47e544614756d77ae3a1939dd1752387604f0 /libavcodec/g723_1dec.c | |
parent | a8ad127a63ab6348050bfade358facae68f39a2a (diff) | |
parent | 1920382aa9f21d7ed1a3c2214990da8d2b067a92 (diff) | |
download | ffmpeg-e815111367cba1ec168ae080a6503e5b3eb326bf.tar.gz |
Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'
* commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92':
dashenc: add option to provide UTC timing source
Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with
the other AVOption.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/g723_1dec.c')
0 files changed, 0 insertions, 0 deletions