diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:05:53 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:05:53 +0100 |
commit | 30099413ecf667f5972edd3ddeb49503b0823e70 (patch) | |
tree | 4b2dea902f53f00b0a92158aaba0aa4de4c87686 /libavfilter/af_compand.c | |
parent | 186e0ff067c458df4358f57c71504ada26d1b18a (diff) | |
parent | eabefe83f40a65d0f0c2a9a0521f6d96c3932545 (diff) | |
download | ffmpeg-30099413ecf667f5972edd3ddeb49503b0823e70.tar.gz |
Merge commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545' into release/2.2
* commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545':
movenc: allow muxing HEVC in MODE_MP4.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_compand.c')
0 files changed, 0 insertions, 0 deletions