diff options
author | James Almer <jamrial@gmail.com> | 2018-04-13 19:58:47 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2018-04-13 19:58:47 -0300 |
commit | ae7e66fb4b1a256fb79a016b9c585de84ac77339 (patch) | |
tree | 93468125fb915952166dfc881f0e5f6195fe0bf3 /libavfilter/af_asetrate.c | |
parent | 6f277e1f76121736baf98aedb2bf55d8bb413fa7 (diff) | |
parent | 29a8ed766354c45c9be4b8512c5b2eb25a450cdc (diff) | |
download | ffmpeg-streaming-ae7e66fb4b1a256fb79a016b9c585de84ac77339.zip ffmpeg-streaming-ae7e66fb4b1a256fb79a016b9c585de84ac77339.tar.gz |
Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'
* commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc':
lavf/qsvvpp: bypass vpp if not needed.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/af_asetrate.c')
0 files changed, 0 insertions, 0 deletions