diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 15:50:37 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 15:50:37 +0100 |
| commit | 97c17cafab4ecf6df70de4ce19ada325d5b585c3 (patch) | |
| tree | facfa46c81f80634f0538304f8e5b86be4b05d20 /libavcodec/arm/mlpdsp_armv6.S | |
| parent | 17f2c0abea87df16edd2a6170a1d3ece23b2e465 (diff) | |
| parent | d10102d23c9467d4eb84f58e0cd12be284b982f6 (diff) | |
| download | ffmpeg-97c17cafab4ecf6df70de4ce19ada325d5b585c3.tar.gz | |
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 <u@pkh.me>
Diffstat (limited to 'libavcodec/arm/mlpdsp_armv6.S')
0 files changed, 0 insertions, 0 deletions