Commit Graph

1099 Commits

Author SHA1 Message Date
Reto Kromer
26c4b10d24 Merge pull request #66 from amiaopensource/retokromer-patch-1
added MKV to MP4
2016-06-30 07:47:27 +02:00
Reto Kromer
57b0bdb5be typo 2016-06-29 20:37:26 +02:00
Reto Kromer
19a6cdc432 added MKV to MP4 2016-06-29 19:08:26 +02:00
Reto Kromer
212bb3f6cd Merge pull request #65 from amiaopensource/retokromer-patch-1
added link for "Transcode to ProRes"
2016-06-29 12:02:14 +02:00
Reto Kromer
bc6beafa22 added link for "Transcode to ProRes" 2016-06-29 11:56:09 +02:00
Ashley
2cce0bb55b Merge pull request #64 from kieranjol/kieranjol-direct-links
Direct links based on @helrond CRALS commit
2016-06-18 18:07:59 -04:00
Kieran O'Leary
3f42736f98 js.js - copy @helrond commit for crals
7c61429878
2016-06-18 22:44:36 +01:00
Kieran O'Leary
62cf86c125 index.html - add direct links 2016-06-18 22:42:46 +01:00
Ashley
3b0feef003 formats list
markdown is funny sometimes
2016-05-19 19:39:58 -04:00
Ashley Blewer
b4578e5ad9 adds list of contributors to readme c/o octohatrack 2016-05-19 19:36:30 -04:00
Ashley
3fde154bdd Merge pull request #63 from kfrn/gh-pages
amend concat command
2016-05-18 09:05:59 -04:00
kfrn
bd928844e6 correct ffmpeg input info 2016-05-19 00:24:22 +12:00
kfrn
0dcb47c98b amend concat command 2016-05-18 23:32:27 +12:00
Ashley
4ba5c5fe0c Merge pull request #62 from amiaopensource/retokromer-patch-1
HTML housekeeping
2016-05-17 20:08:31 -04:00
Reto Kromer
1ebdf36078 Update index.html
* deleted the unused parameter aria-labelledby="myLargeModalLabel"
* solves https://github.com/amiaopensource/ffmprovisr/issues/61#issuecomment-219597053
2016-05-17 08:08:37 +02:00
Reto Kromer
5885d4267e Merge pull request #60 from amiaopensource/retokromer-patch-1
HTML housekeeping
2016-05-16 13:00:55 +02:00
Reto Kromer
c7b52d3114 HTML housekeeping 2016-05-15 13:03:47 +02:00
Reto Kromer
d4d8eea51f HTML housekeeping 2016-05-15 12:13:20 +02:00
Reto Kromer
25b41be22d HTML housekeeping
Sorry, I missed these.
2016-05-15 12:08:57 +02:00
Reto Kromer
f016869a9b HTML housekeeping
- uniform syntax: dt and dd on the same line
- uniform apostrophes: ’
- changed the one single em in an i tag
2016-05-15 12:03:24 +02:00
Reto Kromer
d5c0d450ec Merge pull request #59 from amiaopensource/retokromer-patch-1
added Katherine to the AVHack Team
2016-05-14 11:44:22 +02:00
Reto Kromer
1926ae3143 and some links to their GitHub pages 2016-05-14 10:50:25 +02:00
Reto Kromer
76c06bd7d4 added Katherine to the AVHack Team 2016-05-14 10:34:48 +02:00
Reto Kromer
e3fcac0ce0 Merge pull request #58 from kfrn/gh-pages
add playback rate for play image sequence command
2016-05-14 10:24:01 +02:00
kfrn
283dddc1a1 add minor clarification 2016-05-14 20:20:58 +12:00
kfrn
82baa84595 add playback rate for play image sequence command 2016-05-14 19:49:47 +12:00
Reto Kromer
c2de4ca806 Merge pull request #57 from kfrn/gh-pages
correct typo
2016-05-14 08:50:08 +02:00
kfrn
92a420cfa7 correct typo 2016-05-14 18:18:33 +12:00
Reto Kromer
bebf9f5a14 Merge pull request #56 from kfrn/gh-pages
add trim video option
2016-05-12 22:42:06 +02:00
kfrn
b37fdca5f6 correct trim video command and reinstate text for Excerpt from beginning command 2016-05-12 21:53:46 +12:00
kfrn
5bf9729ddd amend trim video command 2016-05-12 20:39:32 +12:00
kfrn
81a374b354 correct flag 2016-05-11 02:21:10 +12:00
kfrn
ac17c9d54b correct wording 2016-05-11 00:34:44 +12:00
kfrn
806be98b72 add trim video option 2016-05-11 00:23:51 +12:00
Ashley
6b829f2d3c Merge pull request #55 from amiaopensource/retokromer-patch-2
Comments on style
2016-05-07 08:05:50 -04:00
Reto Kromer
2e08fd0742 Comments on style
* If we do not code CR and/or LF into the <p> tag, then is works fine more universally (e.g. on my Braille terminal).
* -vf is an alias for -filter:v. If we use it here, then we should at least mention this alias also in the other recipes.
* Here we use the alias -acodec, otherwise the abbreviation -c:a of -codec:a. This could be confusing for newcomers. At least a remark is needed.
2016-05-07 06:49:10 +02:00
Ashley
96940eb917 Merge pull request #54 from edsu/image-audio
create video from image and audio files
2016-05-06 16:51:13 -04:00
Ed Summers
28b6dda40d add create video from image and audio 2016-05-06 16:38:19 -04:00
Ashley
8d8435b381 Merge pull request #53 from amiaopensource/retokromer-patch-1
Typos
2016-05-06 16:20:03 -04:00
Reto Kromer
b57d892f5a Typos
- unified apostrophes
- flexible line length
2016-05-06 22:05:43 +02:00
Ashley
1907381b83 Merge pull request #52 from edsu/combine-tracks
combine-tracks
2016-05-06 14:38:18 -04:00
Ed Summers
814ca63259 copy video 2016-05-06 14:35:09 -04:00
Ed Summers
c19a0ff05b fixes #51 2016-05-06 14:29:41 -04:00
Reto Kromer
3cb0d069ef Merge pull request #50 from kieranjol/patch-5
index.html -H264- Specify yuv420p earlier for h264
2016-05-06 11:27:17 +02:00
Kieran O'Leary
c7176e905a index.html -H264- Specify yuv420p earlier for h264 2016-05-06 09:53:26 +01:00
Reto Kromer
ff11bff9de Add extract audio
Shorter btn name.
2016-04-28 09:54:04 +02:00
Reto Kromer
ad6941f5af Added extract audio 2016-04-28 09:51:18 +02:00
Reto Kromer
45867d9882 Merge pull request #48 from amiaopensource/ab/license
adds CC-BY license to readme
2016-03-28 16:09:13 +02:00
Ashley Blewer
87ade7e8ed adds CC-BY license to readme 2016-03-28 09:24:01 -04:00
Reto Kromer
5aed5e47fd Merge pull request #45 from kieranjol/patch-4
add setfield and aspect ratio options
2016-03-26 20:01:18 +01:00