Commit Graph

716 Commits

Author SHA1 Message Date
Ashley
11bf8d4de2 Merge branch 'gh-pages' into rm-modal-extras 2017-10-13 13:57:15 -04:00
Ashley
4ccf83b953 Merge pull request #252 from amiaopensource/shorten-button-names
shortens button names
2017-10-13 13:55:46 -04:00
Ashley Blewer
f6be6aa37e we dont need tabindex or role:dialog without the modal 2017-10-13 13:21:20 -04:00
Ashley Blewer
04432d0323 shortens button names 2017-10-13 12:48:37 -04:00
Ashley
ea323d4b01 Merge pull request #250 from amiaopensource/moves-cc-img
moves cc-by img into repo
2017-10-13 09:49:06 -04:00
Ashley
082f9a1175 Merge pull request #248 from amiaopensource/modals-go-inline
modals go inline instead of popup
2017-10-13 09:48:56 -04:00
Ashley Blewer
04776428c8 moves cc-by img into repo 2017-10-12 22:47:58 -04:00
Ashley Blewer
b1f7f5cad4 modals go inline instead of popup 2017-10-12 22:14:47 -04:00
Ashley
6d41096dd5 Merge pull request #247 from amiaopensource/fr-to-perc
changes fractions to percentages in grid template
2017-10-12 22:01:38 -04:00
Ashley
77c31a7c5c Merge pull request #246 from bastibeckr/gh-pages
Add stream-and-record command
2017-10-12 19:29:09 -04:00
Basti Becker
0c9086d70d Update requested changes
Fix HTML, some typos and improve some explanations. Thanks for review.
2017-10-12 12:49:35 +02:00
Ashley Blewer
2b6dfac5b0 changes fractions to percentages in grid template 2017-10-11 21:02:13 -04:00
Basti Becker
ba21f8b88d Add stream-and-record command
I wanted to contribute my livestream-and-record command to this great
collection.
2017-10-11 20:12:39 +02:00
Katherine Frances Nagels
b483acdb6d Merge pull request #244 from kfrn/gh-pages
Fix typo
2017-10-10 21:04:10 +13:00
kfrn
d91fb336b9 Fix typo 2017-10-10 21:02:13 +13:00
Katherine Frances Nagels
97f62ae600 Merge pull request #243 from amiaopensource/make-bigger
initial redesign: grow ffmprovsr
2017-10-10 19:37:16 +13:00
Ashley Blewer
98d2459b79 bring back the charset meta 2017-10-09 09:46:35 -04:00
Ashley Blewer
719e3a73f5 typos in css, again 2017-10-09 09:17:43 -04:00
Ashley Blewer
439f1933da typos in css 2017-10-09 09:16:21 -04:00
Reto Kromer
0f52cde91a info for other OS (#242) 2017-10-09 15:12:39 +02:00
Ashley Blewer
8a14c6e5fb initial redesign: grow ffmprovsr 2017-10-09 09:05:58 -04:00
Katherine Frances Nagels
8c04a58949 Merge pull request #241 from amiaopensource/rm-junk
removes junk that accidentally came into ffmprovisr
2017-10-09 21:43:36 +13:00
Ashley Blewer
6e93313528 removes junk that accidentally came into ffmprovisr 2017-10-08 22:19:46 -04:00
Katherine Frances Nagels
b7bc7218b8 Merge pull request #240 from kfrn/gh-pages
Reorganise some recipes + add filtergraph explanation 'command'
2017-10-08 10:39:35 +13:00
kfrn
7ec21fb6d2 Both info sections at top of page; consistent naming 2017-10-08 09:19:05 +13:00
kfrn
1e2b2dd18f Add target="_blank"s to links; correct to Set Stream Properties recipe
I've replaced the links in the Set Stream Properties recipe with a more specific link.
Also, according to the docs, the correct flag is -color_primaries, not -color_primary.
2017-10-08 01:05:36 +13:00
kfrn
9d4e18e6ef Improve descriptions; ffmpeg → FFmpeg as appropriate
Consistently use FFmpeg to refer to the program and ffmpeg for the command line invocation of the program.
Add another example to the 'asic structure of an FFmpeg command explanation.
Add a note on filter order to the Filtergraph explanation.
2017-10-08 00:47:31 +13:00
kfrn
61681c8dd3 Add basic command explanation; relocate filtergraph explanation
- New section at top: 'Getting started with ffmpeg'. Added basic command explanation under this heading.
- New section at bottom: 'Advanced ffmpeg concepts'. Filtergraph explanation moved there.
2017-10-07 21:35:05 +13:00
kfrn
71e68b5e2e Add filtergraph explanation in new ffmpeg concepts section 2017-10-07 16:02:08 +13:00
kfrn
872eec2aa7 Reorg items: section for GIFs, 'Modify speed' under 'Change Properties' 2017-10-07 14:57:40 +13:00
Katherine Frances Nagels
863f70054d Merge pull request #239 from kfrn/gh-pages
Add basic rewrap command
2017-10-07 10:15:58 +13:00
kfrn
16c8d68e39 Add note on terminology 2017-10-07 00:21:29 +13:00
kfrn
08593bb221 Add basic rewrap command 2017-10-07 00:06:29 +13:00
Ashley
516a78d397 Merge pull request #236 from kfrn/gh-pages
Create more subheadings and reorganise commands
2017-10-04 16:52:10 -04:00
kfrn
89ea7a28bd Rename heading; move recipe; fix broken recipe
- Move 'Set stream properties' to the 'Change video properties' section.
- Heading change: 'Create a video' to 'Create a video from images'. (In the ToC, it's 'Create a video from image(s) and audio')
- 'View Subprogram Info' is fixed (data-target now matches the new ID).
- Consistent capitalisation
2017-10-05 08:59:35 +13:00
kfrn
763e9c594f Add missing </div>; remove comment 2017-10-04 23:11:03 +13:00
kfrn
fd7528a6bd Add 'contents' section at the top of the page
These links wrap a <button> tag and use the "btn" class. To distinguish them from the command buttons that trigger the modals, I've given them a different colour scheme and a different emoji prefix.
2017-10-04 22:22:20 +13:00
kfrn
efd9e55b66 Command name change: 'View Format Info' to 'View ffmpeg subprogram info'
'View format info' seemed to me to be poorly named, what this command actually does is to give details of various libraries, muxers, encoders, etc. 'View ffmpeg subprogram info' may not itself be a totally correct nomenclature, but it's a bit closer to the practical meaning, I think.

Also: a couple of minor text changes.
2017-10-04 21:44:14 +13:00
kfrn
da94557324 Reorganise ffmpeg commands under more/different subheadings 2017-10-04 21:39:18 +13:00
kfrn
f5887473f3 Merge branch 'gh-pages' of https://github.com/amiaopensource/ffmprovisr into gh-pages 2017-10-04 18:20:11 +13:00
Katherine Frances Nagels
17ea63f7b9 Merge pull request #234 from amiaopensource/refactor-headers
refactors headers to be more semantically correct
2017-10-04 09:11:52 +13:00
Ashley Blewer
d7db07bcab refactors headers to be more semantically correct 2017-10-03 12:35:33 -04:00
Katherine Frances Nagels
e92a1cf713 Merge pull request #232 from amiaopensource/html5
cleanup HTML5 code
2017-10-03 07:51:58 +13:00
Reto Kromer
96903f018c cleanup HTML5 2017-10-02 17:45:00 +02:00
Reto Kromer
fcc95ce518 Merge pull request #231 (missing quotes in link) 2017-10-02 15:34:48 +02:00
Reto Kromer
8c349b8282 missing quotes in link 2017-10-02 15:20:27 +02:00
Katherine Frances Nagels
93627e0da2 Stylistic changes; expansion on a small number of commands (#230) 2017-10-02 15:13:57 +02:00
kfrn
593bb63e23 Cleanups: bold post-heading colons, ffmpeg → ffplay/ffprobe as approp.
In several places, ffprobe or ffplay commands said ffmpeg in the command breakdown. This is because of me doing a sloppy cut & paste in a previous commit in this PR.

Previously, colons succeeding a bold 'Notes' mini-heading were not themselves also bold. Reto noted this, and the Chicago Manual of Style does indicate that such colons should also be in bold.
2017-10-03 02:05:00 +13:00
kfrn
3a58b6ae82 Style: add spaces in long filtergraphs; only use italics for inputs
In filtergraphs that are reasonably long or unwieldy, I've added a space after each comma for readability.
In ffmpeg commands, italics should denote user inputs/outputs. Where italics had been used for 'regular' variables (i.e., not an input/output file or a variable for which the user must explicitly choose the value), I've deleted them.

These are stylistic changes that, I think, make things more readable and/or more uniform.
2017-10-03 01:31:23 +13:00
kfrn
11848054a3 Break out commands into subsegments
I've elaborated further on certain commands, and added lines for opening and closing quotation marks for others.
There are also some minor style fixes.
2017-10-03 00:34:47 +13:00