From: Clément Bœsch Date: Wed, 22 Mar 2017 14:50:37 +0000 (+0100) Subject: Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6' X-Git-Tag: n3.3~459 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=97c17cafab4ecf6df70de4ce19ada325d5b585c3;hp=-c Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6' * commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6': avconv: set the encoding framerate when the output is CFR This commit is a noop, see 8db301deadfcf113fb274881e65afcbe3e1bd645 Merged-by: Clément Bœsch --- 97c17cafab4ecf6df70de4ce19ada325d5b585c3