mirror/ffmprovisr
1
0
Fork 0
mirror of https://github.com/amiaopensource/ffmprovisr.git synced 2024-12-26 11:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
642 Commits 1 Branch 65 Tags 40 MiB
c6f7593d65
Commit Graph

386 Commits

Author SHA1 Message Date
Andrew Weaver
11fb0fc39c Merge branch 'gh-pages' into aweaver-branch 2016-10-31 15:06:04 -04:00
Andrew Weaver
d8a7dbbd2c wording 2016-10-31 15:05:55 -04:00
Andrew Weaver
690d4db537 append notice to access mp3 2016-10-31 10:25:00 -04:00
kfrn
7086552310 Reinsert space for ffmpeg options into generic command; fix typo 2016-10-31 21:08:16 +13:00
kfrn
cc972d94b6 Expand batch processing command 2016-10-31 21:00:56 +13:00
Reto Kromer
2750448bea Merge pull request #103 from kfrn/gh-pages 
Add DVD -> H.264 command
 2016-10-30 19:57:53 +01:00
kfrn
99e4501657 Fix typo 2016-10-31 07:56:50 +13:00
kfrn
fb2e571806 Minor text edits (punctuation, clarification) 2016-10-31 07:54:36 +13:00
Kieran O'Leary
36409683c1 image watermark - typo 2016-10-30 14:29:32 +00:00
Kieran O'Leary
5942d20297 adds image watermark overlay 2016-10-30 14:08:25 +00:00
kfrn
b99d80f2e0 Update instructions on sample example 2016-10-30 21:15:51 +13:00
kfrn
ef43d544a8 Add further explanation of .VOB files 2016-10-30 21:13:27 +13:00
kfrn
88f8480bf0 Add command to create H.264 from DVD 2016-10-30 21:05:49 +13:00
Ashley Blewer
dbbf7dd799 adds missing parens 2016-10-23 13:14:58 -04:00
Ashley Blewer
67f9f71afe clarifies need for the globbing 2016-10-23 10:10:20 -04:00
Ashley Blewer
6d52445376 adds image-to-gif example #98 2016-10-22 20:08:16 -04:00
Kieran O'Leary
f9bd8c97fb add -report to ffv1 fixity https://github.com/amiaopensource/ffmprovisr/issues/86 2016-09-24 13:14:30 +01:00
Reto Kromer
3403244981 thanks 2016-09-19 18:47:31 +02:00
Reto Kromer
0e9530d95a SD to HD with modifying the luma coefficients 
I guess, this answers https://github.com/amiaopensource/ffmprovisr/issues/46
 2016-09-19 18:30:52 +02:00
Ashley Blewer
24c0552791 semantic changes to keep recipe consistent with others 2016-09-05 11:00:02 -04:00
Ashley Blewer
797fcbab0a command for covering head switching noise resolving #42 2016-08-31 21:11:40 -04:00
Reto Kromer
d25ce0a832 Merge pull request #94 from kieranjol/kieranjol-format-info 
add view format info
 2016-08-30 17:34:28 +02:00
Kieran O'Leary
b1b40658f0 view format info - add example list via @retokromer 2016-08-30 13:22:26 +01:00
Kieran O'Leary
634bf48abf fix play image sequence 2016-08-29 10:28:58 +01:00
Kieran O'Leary
94dfe1a868 add view format info 2016-08-29 10:20:30 +01:00
Reto Kromer
12e08bf9c0 Added -copyts option to trim recipe 2016-07-24 19:44:34 +02:00
Reto Kromer
a26013e29b typo 
- useless spaces
- used Matroska everywhere
- removed double link in a recipe
 2016-07-22 17:42:38 +02:00
Ashley Blewer
faf77f3a52 correct br/ to /dd 2016-07-22 03:28:05 -04:00
Ashley Blewer
b64f28f23e Merge branch 'set-stream-properties' of github.com:dericed/ffmprovisr into set-stream-properties 2016-07-22 03:23:22 -04:00
Ashley Blewer
5952316923 uses verbose filter:v for new learners 2016-07-22 03:15:39 -04:00
Dave Rice
20db359803 add notes about setting properties during stream copy 2016-07-22 07:53:36 +01:00
Ashley Blewer
c3e33a3405 links to idet filters and paper expanding subject 2016-07-21 17:16:38 -04:00
Ashley Blewer
83d3cd6510 adds idet filter for checking interlacement pattern status of video to preservation category 2016-07-21 16:58:59 -04:00
Reto Kromer
5f911626b3 unified syntax 
same style for all recipes
 2016-07-14 17:47:17 +02:00
Reto Kromer
5327faffa9 typo 
Same file-name in the description and in the example.
 2016-07-14 17:37:02 +02:00
Reto Kromer
b7de4101ea added the verification Bash script 
Please see https://github.com/amiaopensource/ffmprovisr/pull/74
 2016-07-10 14:54:37 +02:00
Kieran O'Leary
1f75fe2b7d dcp to h264 - html fixes/typos. 2016-07-10 10:03:28 +01:00
Kieran O'Leary
a0f56e907b h264 from dcp - mp4/pcm fix - thx @retokromer 2016-07-10 09:47:23 +01:00
Reto Kromer
2845cbc14f HTML5 housekeeping 
indents should now be nice on any HTML editor
 2016-07-02 08:04:09 +02:00
Reto Kromer
f32ad1930b added: extensions for containers 2016-07-02 07:34:00 +02:00
Reto Kromer
d12d13aaaa MKV to MP4 
added: MP4 cannot contain PCM sound
 2016-07-02 07:22:41 +02:00
Reto Kromer
37cdd226fc HTML5 housekeeping 2016-07-01 16:37:38 +02:00
Reto Kromer
22a2a33b23 corrected MKV to MP4 
Remark on silent files belongs sound codec.
 2016-06-30 07:51:15 +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
bc6beafa22 added link for "Transcode to ProRes" 2016-06-29 11:56:09 +02:00
Kieran O'Leary
62cf86c125 index.html - add direct links 2016-06-18 22:42:46 +01: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
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
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
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
kfrn
92a420cfa7 correct typo 2016-05-14 18:18:33 +12: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
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
Reto Kromer
b57d892f5a Typos 
- unified apostrophes
- flexible line length
 2016-05-06 22:05:43 +02: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
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
Kieran O'Leary
2547de7c36 add setfield and aspect ratio options 2016-03-26 18:07:57 +00:00
Reto Kromer
276853df83 Update index.html 2016-03-17 18:06:56 +01:00
Kieran O'Leary
bfcc1c654e imagesequence to video - framerate option added 2016-03-07 12:14:24 +00:00
Kieran O'Leary
3a33c2a283 Extra options to test filters 2016-01-23 11:54:52 +00:00
Reto Kromer
bc92215672 typo 
copy&paste…
 2016-01-10 14:21:56 +01:00
Reto Kromer
67f5124b95 added play VGA SMPTE bars 2016-01-10 11:40:49 +01:00
Reto Kromer
a8a3efbb40 added play HD SMPTE bars 2016-01-10 11:27:26 +01:00
Reto Kromer
dbae97bc71 typos 
unified MP3 and [more]
 2016-01-10 11:00:29 +01:00
Reto Kromer
a5a6b082b1 added target=blank and testsrc info 2016-01-09 20:40:47 +01:00
Ashley Blewer
80c623de65 adds section for the different kinds of test videos that can be generated on the fly 2016-01-09 09:56:33 -05:00
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
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
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
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
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
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
Kieran O'Leary
6a502147ab add burn in timecode 2015-12-25 01:07:27 +00: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
Kieran O'Leary
af31c619d1 DCP tp H264 - remove redundant <i> tags 2015-12-21 17:04:29 +00:00
Kieran O'Leary
bccfacab07 Added audio options for DCP to H264 2015-12-21 17:01:11 +00:00
Reto Kromer
f52ca6c850 typos in "WAV to MP3" 2015-12-20 13:59:17 +01:00
Reto Kromer
8e53187fe1 typos in "WAV to MP3" 2015-12-20 13:57:35 +01:00
Reto Kromer
3f5c050a19 typos in "Create GIF" 2015-12-20 13:53:26 +01:00
Ashley Blewer
640f029ac9 not ideal but step towards offline functionality 2015-12-19 17:42:37 -05:00
Reto Kromer
7799c8f977 added speed modification 2015-12-13 11:03:48 +01:00
Reto Kromer
d8abc766bf added speed modification 2015-12-13 11:01:39 +01:00
Reto Kromer
b48eb5deee added speed modification 2015-12-13 10:58:10 +01:00
Ashley Blewer
bd13a2889e Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-12-06 20:54:49 -05:00
Ashley Blewer
5b01c17fa2 upgrades to https 2015-12-06 20:54:43 -05:00
Reto Kromer
eec87af7f7 Update index.html 2015-12-06 15:38:46 +01:00
Reto Kromer
19039f2ba1 added sound handling 
for flip image and 4:3 <-> 16:9 formula
 2015-12-06 15:36:13 +01:00
Reto Kromer
8db0ef60b2 Didactically grouped... 
... all video parameters together, and all sound parameters together. And a little typo as well.
 2015-12-05 15:42:21 +01:00
Reto Kromer
3d6c26f161 added more general regex 
& typos
 2015-12-05 07:11:38 +01:00
Ashley
666277c44e Merge pull request #19 from llogan/gh-llogan 
index: various edits
 2015-12-04 22:15:16 -05:00
Lou Logan
97ce2a6928 index: various edits 
Create GIF: Add examples using the palettegen and paletteuse filters.

WAV to MP3: Mention what happens if "-ar" is omitted.

Batch Processing: Add "-map 0" to map all streams (from input 0)
instead of relying on stream selection defaults.

Split audio and video tracks: Use stream specifiers instead of indexes.
More efficient and less prone to errors.

Transcode to H.264: Default is not 4:2:2, but depends on input.

NTSC to H.264: Do all filtering in one filtergraph for better control.
Use format instead of "-pix_fmt" when filtering.

Various: Replace "-c:v copy -c:a copy" with "-c copy" and other minor
edits. Remove superfluous "-f image2" instances.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-12-04 17:26:53 -09:00
Reto Kromer
6d3ad02d2c Update index.html 2015-12-04 20:05:11 +01:00
Reto Kromer
7e1bf244dc added: flip image 2015-12-04 20:02:59 +01:00
Reto Kromer
1b09c29e62 typo 2015-12-03 17:11:58 +01:00
Reto Kromer
8c5b199f37 typo & more accurate information 
crt 18 = visually lossless
upscaling filter works also for downscaling
 2015-12-02 12:12:22 +01:00
Ashley Blewer
034ad0c42a li to dt switcheroo 2015-12-01 20:48:25 -05:00
Ashley Blewer
0cc2a1fedf merge conflict thanks reto! 2015-12-01 20:47:00 -05:00
Ashley Blewer
b68c34407e adjust definition of pix_fmt 2015-12-01 20:44:08 -05:00
Reto Kromer
11c7fe168b typo 2015-12-01 15:26:32 +01:00
Reto Kromer
47d391bf45 typos 2015-11-30 20:46:19 +01:00
Reto Kromer
81986081de 16:9 to 4:3 added 2015-11-29 09:50:12 +01:00
Reto Kromer
77f176b257 new try 2015-11-28 22:28:55 +01:00
Reto Kromer
d378b91fac errata corrige 2015-11-28 22:26:30 +01:00
Reto Kromer
1af81e332d Added 4:3 to 16:9 transformation 2015-11-28 22:22:31 +01:00
Reto Kromer
074167749b completed the update of HTML5 layout with <dl> 
--> at least one issue is still open
--> I'll check the content as soon as the new version is live
 2015-11-28 11:42:16 +01:00
Ashley Blewer
604688b1dd resolves merge conflict 2015-11-27 18:11:55 -05:00
Reto Kromer
5866e02191 some <dl> 2015-11-27 20:51:17 +01:00
Ashley Blewer
5f8897be83 Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-11-27 14:19:36 -05:00
Ashley Blewer
cf68a63410 switches to font with weights and tries out dl/dt/dd structure 2015-11-27 14:19:29 -05:00
Reto Kromer
64d4b1ec6f HTML5 cleaned 2015-11-27 19:57:51 +01:00
Reto Kromer
87a1556ee9 HTML5 cleaned 2015-11-27 19:52:24 +01:00
Reto Kromer
a14cffe573 HTML5 should be fine 2015-11-27 08:56:09 +01:00
Reto Kromer
89c68ec5ee additional polishing (more to be done) 2015-11-26 21:43:16 +01:00
Reto Kromer
da9ccd3396 please check "Create GIF" 2015-11-26 21:21:04 +01:00
Ashley Blewer
d76d3483aa notes care of reto kromer! 2015-11-26 13:01:33 -05:00
Ashley Blewer
738cdd5b20 NTSC to h264 2015-11-25 20:26:49 -05:00
Ashley Blewer
6f9a8e799d git it 2015-11-25 19:41:18 -05:00
Ashley Blewer
b2ca91665e better copy 2015-11-25 19:38:53 -05:00
Ashley Blewer
2ea8112772 create iso 2015-11-25 19:38:01 -05:00
Ashley Blewer
b505ca73e1 moves and fixes 2015-11-25 19:29:55 -05:00
Ashley Blewer
ed14f80d4a generate thumbnails 2015-11-25 19:28:03 -05:00
Ashley Blewer
006e880f3a shorter 2015-11-25 19:24:57 -05:00
Ashley Blewer
c225768a41 adds dcp to h264 2015-11-25 19:20:37 -05:00
Ashley Blewer
66f0d58107 hide sample example now that hacking is not in sprint 2015-11-23 18:08:51 -05:00
Ashley
6027dd3092 Merge pull request #2 from jfarbowitz/gh-pages 
took out "the"
 2015-11-22 14:36:04 -05:00
rfraimow
dce278e958 Update index.html 2015-11-18 20:00:26 -05:00
Ashley Blewer
7a61e36fc6 Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-11-18 16:53:24 -08:00
Ashley Blewer
af14451e46 adds create a gif from a vid 2015-11-18 16:53:15 -08:00
Jonathan Farbowitz
4cce7a674f took out "the" 2015-11-18 19:48:02 -05:00
Jonathan Farbowitz
bbb07c3dfb Merge pull request #1 from amiaopensource/gh-pages 
Improved Text!
 2015-11-18 19:35:17 -05:00
Ashley Blewer
0aa3d23da7 Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-11-18 16:30:12 -08:00
Jonathan Farbowitz
63ed772e5c Adjusted intro text and concatenate description 2015-11-18 19:30:11 -05:00
Ashley Blewer
4688388649 fix this thing 2015-11-18 16:29:52 -08:00
rfraimow
0ed05c7ec8 Update index.html 2015-11-18 19:25:39 -05:00
Ashley Blewer
9dd15fbb55 Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-11-18 16:16:17 -08:00
Ashley Blewer
59584dd9da add transcode to prores 2015-11-18 16:16:15 -08:00
rfraimow
f34ca7dc4e Update index.html 2015-11-18 19:13:26 -05:00
Ashley Blewer
fd5c4c6de7 create frame md5s and adjust 2015-11-18 16:02:43 -08:00
Ashley Blewer
2ffdf0fbe8 add nicoles bash script 2015-11-18 15:55:53 -08:00
Ashley Blewer
46be105b19 converts wav to mp3 2015-11-18 15:39:08 -08:00
Ashley Blewer
85431caec1 merge 2015-11-18 15:26:38 -08:00
Ashley Blewer
4f5b874d33 lists 2015-11-18 15:25:55 -08:00
rfraimow
1738d4fb67 Update index.html 2015-11-18 18:23:07 -05:00
rfraimow
3db54b4f0f Update index.html 2015-11-18 18:21:48 -05:00
Ashley Blewer
76e46da47a name swap 2015-11-18 15:17:44 -08:00
Ashley Blewer
9c67282030 cool refactoring 2015-11-18 15:16:53 -08:00
Ashley Blewer
fa69e7befc merge 2015-11-18 15:15:07 -08:00
Ashley Blewer
83c9b31336 fixing things 2015-11-18 15:14:37 -08:00
rfraimow
ae31c69777 Update index.html 2015-11-18 18:13:00 -05:00
Ashley Blewer
13a4cf2c2a Merge branch 'gh-pages' of github.com:amiaopensource/ffmprovisr into gh-pages 2015-11-18 15:09:43 -08:00
Ashley Blewer
74f0a6678b new style 2015-11-18 15:09:37 -08:00