Commit Graph

227 Commits

Author SHA1 Message Date
Ashley Blewer
b5cfec3a8d replaces font-awesome with the learning star 2016-01-07 19:38:27 -05:00
Ashley Blewer
7d7f2e0c69 moves font-awesome from CDN to locally hosted 2016-01-07 19:31:04 -05:00
Reto Kromer
71076d9e53 Merge pull request #34 from amiaopensource/kgrons-patch-typo-1
correct typo
2016-01-06 21:22:55 +01:00
Kathryn
f6e6f9c150 correct typo
correct small typo in help language for other > play an image sequence
2016-01-06 15:08:15 -05:00
Reto Kromer
7f09f3e271 updated Excerpt from end
Added some more explanations on -sseof.
2016-01-02 08:59:56 +01:00
Reto Kromer
bab6dc327a modified Excerpt from end
with -ssoef before -i
2016-01-02 08:38:25 +01:00
Reto Kromer
96af44f8cf testing
Something is wrong! I am testing off line.
2016-01-02 08:02:17 +01:00
Reto Kromer
21d8e9e3bc typos
very minor typos
2016-01-02 07:51:26 +01:00
Reto Kromer
5b5aa8057e Merge pull request #33 from amiaopensource/ab/categories
Category-based scripts
2016-01-02 07:36:00 +01:00
Ashley Blewer
81e75cf9aa small adjustment to intro text 2016-01-01 14:54:53 -05:00
Ashley Blewer
24d8dab19b moves scripts into categories 2016-01-01 14:52:12 -05:00
Ashley Blewer
e16fa215a7 adds "excerpt from end" 2016-01-01 14:12:39 -05:00
Reto Kromer
bab001179d typos
quotation marks and apostrophes should now be uniform (“-” and ’)
2016-01-01 09:30:48 +01:00
Reto Kromer
3ac96b11f9 added play image sequance 2016-01-01 07:59:58 +01:00
Ashley
cf1e8c9991 Merge pull request #31 from kieranjol/patch-4
missed a few FFv1 typos
2015-12-27 11:03:40 -05:00
Reto Kromer
8068d6ec6b typos 2015-12-27 17:03:01 +01:00
Kieran O'Leary
749ab19fdb missed a few FFv1 typos 2015-12-27 16:01:33 +00:00
Reto Kromer
6fa1d30cff Merge pull request #30 from kieranjol/patch-3
Add FFv1 in matroska recipe
2015-12-27 16:58:04 +01:00
Kieran O'Leary
359af24b48 fix FFV1 spelling
thx @retokromer
2015-12-27 15:53:55 +00:00
Kieran O'Leary
e28535c270 Add FFv1 in matroska recipe
slice info taken from ffmpeg wiki and @dinahhandel blog (both linked in recipe)
2015-12-27 15:41:31 +00:00
Reto Kromer
609f3b7185 Update index.html 2015-12-27 15:24:02 +01:00
Reto Kromer
a409c6dc31 Merge pull request #29 from jmsam81/wav_to_mp3
changed the wav to mp3 code to produce files with better audio quality.
2015-12-27 15:22:59 +01:00
jmsam81
d8feea0275 changed the wav to mp3 code to produce files with better audio quality. 2015-12-26 22:29:17 -08:00
Reto Kromer
35dcd13e42 Added Images to video
typo
2015-12-26 10:56:41 +01:00
Reto Kromer
ba0d629703 Add Images to video
shorter btn name
2015-12-26 10:55:15 +01:00
Reto Kromer
67093745e6 Added images to video 2015-12-26 10:53:15 +01:00
Ashley
546c3caccd Merge pull request #28 from kieranjol/patch-2
Add ffv1 fixity check & small typo fixes
2015-12-25 08:52:44 -05:00
Kieran O'Leary
78f70f28f6 Add ffv1 fixity check 2015-12-25 11:49:44 +00:00
Kieran O'Leary
e59026830b Another typo and less silly watermark example text 2015-12-25 10:29:03 +00:00
Kieran O'Leary
5664007eab small typo 2015-12-25 10:21:53 +00:00
Reto Kromer
f30d92e765 Update index.html 2015-12-25 10:26:12 +01:00
Reto Kromer
797e9f207c HTML typo
I guess clearer (for the maintainers) with a newline.
2015-12-25 08:18:46 +01:00
Reto Kromer
f49f8d89b2 little typos
– added missing \</dd\>
– added remark -vf = -filter:v
2015-12-25 07:58:08 +01:00
Ashley
80aa73f032 Merge pull request #26 from kieranjol/patch-1
add burn in timecode
2015-12-24 20:26:53 -05:00
Kieran O'Leary
6a502147ab add burn in timecode 2015-12-25 01:07:27 +00:00
Ashley
f27bf28f81 Merge pull request #24 from kieranjol/patch-1
add text watermark
2015-12-24 18:17:28 -05:00
Kieran O'Leary
8b8c43729f text_watermark - typos and x/y coordinate update
@ablwr's comments applied, and x/y coordinates taken from ffmpeg docs https://ffmpeg.org/ffmpeg-filters.html#Examples-39
2015-12-24 23:15:11 +00:00
Kieran O'Leary
85f207b360 text_watermark - typo fixes 2015-12-24 18:47:37 +00:00
Kieran O'Leary
0d59a592fb text_watermark - seriously_ultra_final_tweak 2015-12-24 18:39:32 +00:00
Kieran O'Leary
90b7a6e7f8 text_watermark - ultra_final_first_draft 2015-12-24 18:32:58 +00:00
Kieran O'Leary
75d56e2a96 text_watermark - fix <i> tags 2015-12-24 18:29:38 +00:00
Kieran O'Leary
111594572f text_watermark - final tweaks 2015-12-24 18:22:44 +00:00
Kieran O'Leary
633d04e046 text_watermark - moar options 2015-12-24 18:17:06 +00:00
Kieran O'Leary
9ca3f9421c text_watermark - moar options 2015-12-24 18:09:22 +00:00
Kieran O'Leary
b5e04455e3 Update index.html 2015-12-24 17:52:05 +00:00
Kieran O'Leary
8c62668ee7 Update index.html 2015-12-24 17:48:17 +00:00
Kieran O'Leary
38fe644c41 style test 2015-12-24 17:44:02 +00:00
Kieran O'Leary
a70a6a4bc0 test_watermark 2015-12-24 17:32:09 +00:00
Ashley Blewer
a04e257bc9 clarification 2015-12-23 19:50:39 -05:00
Ashley Blewer
d62910a956 Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-12-22 23:07:26 -05:00