diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-17 10:28:54 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-17 10:28:54 +0200 |
| commit | cc8cafae8775496a5a62285ad828db2d7fc1e7d8 (patch) | |
| tree | f91abbb83808d3f37f8d85a9dcf65af399386c23 /libavfilter/avf_concat.c | |
| parent | 9142b04bba45c27a69ac8baec088357070614674 (diff) | |
| parent | 7d81698b89172d2dcf1b78d4b42ba86262360559 (diff) | |
| download | ffmpeg-cc8cafae8775496a5a62285ad828db2d7fc1e7d8.tar.gz | |
Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'
* commit '7d81698b89172d2dcf1b78d4b42ba86262360559':
vaapi_h265: Fix CFR mode with framerate set in AVCodecContext
This commit is a noop, see 37de9ce713ebb65d8b040f4f83ba7542f0754485
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions