1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'

* commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301dead

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2017-03-22 15:50:37 +01:00

Diff Content Not Available