Commits · c465d2a2bb3bb4eb5291f05450a717d8bd67d5d2 · 胡斌 / merge_av

07 Dec, 2017 3 commits
- 1.convert webm to mkv to parsing the duration · c465d2a2 ...
  c465d2a2 Browse Directory
```
2.using the length parsed from video file,not the length in recording info file
3.append blank video to audio of the last segment if the duration is big than 1s
```
  胡斌 authored 2017-12-07 23:24:48 +0800
- try to avoid the start time is not 0 · 35edaa40
  35edaa40 Browse Directory
  
  胡斌 authored 2017-12-07 19:43:25 +0800
- for the record file only have audio,merge with blank.jpg · 3569f789
  3569f789 Browse File
  
  胡斌 authored 2017-12-07 09:21:38 +0800
01 Dec, 2017 1 commit
- improve help · 6a662776
  6a662776 浏览文件
  
  胡斌 authored 2017-12-01 18:37:25 +0800
30 Nov, 2017 8 commits
- fix compile error in linux · db0155f1
  db0155f1 浏览文件
  
  胡斌 authored 2017-12-01 07:23:37 +0800
- improve readme · 8c30879c
  8c30879c 浏览文件
  
  胡斌 authored 2017-12-01 07:17:21 +0800
- improve readme · 10debda1
  10debda1 浏览文件
  
  胡斌 authored 2017-12-01 07:14:10 +0800
- support keep or delete the temp files,using -k option · cf45a1b7
  cf45a1b7 浏览文件
  
  胡斌 authored 2017-12-01 07:10:57 +0800
- add version · 1f007146
  1f007146 浏览文件
  
  胡斌 authored 2017-11-30 23:20:51 +0800
- readme · f8804b08
  f8804b08 浏览文件
  
  胡斌 authored 2017-11-30 23:06:54 +0800
- fix bug in linux · d73ce73c
  d73ce73c 浏览文件
  
  胡斌 authored 2017-11-30 08:45:27 +0800
- fix bug in linux for loading codec param from cfg file · 71d136a8
  71d136a8 浏览文件
  
  胡斌 authored 2017-11-30 08:14:57 +0800
29 Nov, 2017 6 commits
- support load audio codec param and video codec param from merge_av.cfg · 90883d03
  90883d03 浏览文件
  
  胡斌 authored 2017-11-30 07:56:20 +0800
- add test file · 28d413f9
  28d413f9 浏览文件
  
  胡斌 authored 2017-11-29 23:34:49 +0800
- fix warning · fc098053
  fc098053 浏览文件
  
  胡斌 authored 2017-11-29 23:31:04 +0800
- fix compile error in linux · d191e6b8
  d191e6b8 浏览文件
  
  胡斌 authored 2017-11-29 23:28:21 +0800
- improve help info · 016ce310
  016ce310 浏览文件
  
  胡斌 authored 2017-11-29 23:22:29 +0800
- merge the audio file and video file according to the recordinfo · f03349d3
  f03349d3 浏览文件
  
  胡斌 authored 2017-11-29 23:12:14 +0800