diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-29 13:45:51 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-29 13:45:51 +0200 |
commit | dcdd52101f31f696dfe7a919d6fa6879c1b40945 (patch) | |
tree | 3c032c080a72780cb6100be2379eac3d4f5a4e4b /libavfilter/af_amerge.c | |
parent | 9bed10afb8b28f9aa8a90ab24b7103d9a35de3cc (diff) | |
parent | 90265814f993098d79b0a0f40745ecdb403fbf56 (diff) | |
download | ffmpeg-dcdd52101f31f696dfe7a919d6fa6879c1b40945.tar.gz |
Merge commit '90265814f993098d79b0a0f40745ecdb403fbf56'
* commit '90265814f993098d79b0a0f40745ecdb403fbf56':
examples/decode_audio: constify the AVCodec instance
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions