commit 99bc30e63892fa8404007a587add5c6bb068a354
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon May 14 19:44:44 2018 +0100

    Add make dep

commit c2405b9515bd5cd09c0e0ddfbdbfe20591ec7fb0
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon May 14 15:24:47 2018 +0100

    AD updates, remove gnutls and more
    
      * use compiler packages
      * disable windows build for time being
      * LGPL build

commit 427cecd5880d61fe731582c2b87078433d7540d1
Merge: 95320d0 7d6b76a
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Fri May 4 13:13:12 2018 +0200

    Merge pull request #47 from carlodri/bump_v40
    
    bump to v4.0

commit 7d6b76a3c690064fd0a9b2738729a532a25b4a5a
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Apr 28 15:20:51 2018 +0200

    bump to v4.0
    
    * add osx patch
      relevant for xcode < 7.0
      ref: https://trac.macports.org/ticket/55746
    * multicore make
    * use conda-build 3 compiler syntax
    * remove "manual" pkg-config from build for zlib
    * remove yasm

commit 95320d0d8000e9cd51232e2b1f5ebaaeccf3f5e6
Merge: 243fbc7 80ab01f
Author: Santi Villalba <sdvillal@users.noreply.github.com>
Date:   Tue Mar 13 14:42:34 2018 +0100

    Merge pull request #46 from carlodri/bump_342
    
    bump version to 3.4.2

commit 80ab01f84044820505c7b8bec39054ef3de2caa7
Author: Carlo <carlo.dri@gmail.com>
Date:   Tue Mar 13 12:54:50 2018 +0100

    add myself as maintainer

commit bfdde34c84b51b23da0191362dad3aa68dea8b98
Author: Carlo <carlo.dri@gmail.com>
Date:   Tue Mar 13 12:54:22 2018 +0100

    update bld.bat

commit 26b850041635985d50a310f2fbd4b2675d9a0641
Author: Carlo <carlo.dri@gmail.com>
Date:   Tue Mar 13 12:53:22 2018 +0100

    update meta.yaml

commit c873fc07a5eff2ca35e2cffd252a3cdbc3d7695a
Merge: 6d5d02f 243fbc7
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Tue Mar 13 12:50:58 2018 +0100

    Merge pull request #1 from conda-forge/master
    
    update from master fork

commit 243fbc75e333d0fedc3cbcf29f3f26da010aea2a
Merge: c00d9d2 fee4a8b
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Fri Feb 9 07:37:40 2018 +0000

    Merge pull request #45 from loopbio/gnutls
    
    Enable https

commit fee4a8b09873ae91b11636e58232d687a5113d42
Author: santi <sdvillal@gmail.com>
Date:   Fri Feb 9 07:45:47 2018 +0100

    enable https

commit c00d9d2a4d3991673ce454ad234f90a4d1e173b9
Merge: c89b89a 87896fb
Author: jakirkham <jakirkham@gmail.com>
Date:   Thu Feb 1 22:42:10 2018 -0500

    Merge pull request #43 from loopbio/drawfilter-gpl3
    
    Add freetype (drawfilter support), bump to GPLv3

commit 87896fbde92bea449a8be8acbcafb6ce36abdca3
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Feb 1 22:40:32 2018 -0500

    Bump build number to 1  [ci skip]
    
    Needed to rebuild `ffmpeg` with the new dependency.

commit e0a069a9cbfb0f7accd2cc4bf9d2778af33c8e5a
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Thu Feb 1 23:45:51 2018 +0000

    MNT: Re-rendered with conda-smithy 2.4.5

commit 8628ff41a1a5411055497d60648a037d5321de3c
Author: santi <sdvillal@gmail.com>
Date:   Thu Feb 1 15:43:24 2018 +0100

    add maintainer

commit c741e002bdabd8c68036052016ab85afc20be3f0
Author: santi <sdvillal@gmail.com>
Date:   Thu Feb 1 15:08:15 2018 +0100

    we are using GPLv3
    
    since we are using --enable-version-3, see build.sh

commit 62f2ce832943d5839cb5a51fb1ce66a4b6effae6
Author: santi <sdvillal@gmail.com>
Date:   Thu Feb 1 15:03:20 2018 +0100

    enable freetype (drawtext filter)

commit c89b89a43c9b13bcd8479dcada1cfc61600109c1
Merge: 6d5d02f cc67ea8
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Fri Dec 15 09:22:50 2017 +0100

    Merge pull request #41 from carlodri/carlodri-bump-v3_4_1
    
    bump to v3.4.1

commit cc67ea8df2b0beb70ebb80b4f8dfeaaeddeb0098
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Thu Dec 14 09:45:34 2017 +0100

    Update bld.bat

commit dce10573bc1328dacb4436b778943074c680e15e
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Thu Dec 14 09:39:04 2017 +0100

    bump to 3.4.1

commit 6d5d02ff6a4fe7e48e1be0d456f081056889d1d2
Merge: 82c5491 cecd00d
Author: Filipe <ocefpaf@gmail.com>
Date:   Thu Nov 23 17:00:21 2017 -0200

    Merge pull request #40 from ocefpaf/update_pins
    
    Update pins

commit cecd00dee105d10ad3f87753c35c34c8377b80cb
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 23 15:02:13 2017 -0200

    conda-inspect

commit f7ef4a0ac91e065d3dfe622db9fc85119cad89d1
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 23 14:32:14 2017 -0200

    update pins

commit 82c5491054c7b007c882f3706926e475a015eec6
Merge: 30ba89d 44f0955
Author: Filipe <ocefpaf@gmail.com>
Date:   Fri Nov 10 09:21:39 2017 -0200

    Merge pull request #39 from ocefpaf/pin_zlib
    
    Pin zlib

commit 44f095537d4f71d84f002ad58f2e430f1ac2f057
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 9 08:42:49 2017 -0200

    pin zlib 1.2.11

commit 6837329b558a6cb241bef7936efef47c5c24bbf6
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 9 08:42:43 2017 -0200

    rerender

commit 30ba89dfdd16ef69eef0331a5982957d8ef570ee
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 19:19:51 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit 60e70fc517dad767bf3471d3af22ad705b1f46b5
Merge: 6ba7e4e 8e328d3
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed May 31 22:30:41 2017 +0200

    Merge pull request #33 from jakirkham/re-render__master__2.3.1
    
    MNT: Re-rendered with conda-smithy 2.3.1 [ci skip]

commit 8e328d3ffcf70f1ed3e566169883782b924fd2a3
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 31 13:32:05 2017 -0400

    MNT: Re-rendered with conda-smithy 2.3.1

commit 6ba7e4e893d14673c562daaa8b066683033ca517
Merge: 8eef698 ba6c098
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Fri May 26 15:52:52 2017 +0200

    Merge pull request #31 from patricksnape/libavresample
    
    Add libavresample - borrowed from homebrew

commit ba6c098e2740a7155dfdd3fcb73d90b99ac39ccb
Author: Patrick Snape <psnape@apple.com>
Date:   Wed May 24 15:20:28 2017 +0200

    Bump build number and add test for dynamic libs
    
    Check on OSX and Linux that the .dylib and .so files
    are actually installed.
    
    Also, add myself to the maintainers list.

commit ba3aac28930775d099beadb7931917596d7d0daa
Author: Patrick Snape <psnape@apple.com>
Date:   Mon May 22 11:50:28 2017 +0200

    Add libavresample

commit 8eef6988a953300ff548b0b0d219e96a30bd7060
Merge: 1f49d27 d969907
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Sat Apr 22 19:05:22 2017 +0200

    Merge pull request #26 from caspervdw/version-update
    
    Version update to 3.2.4

commit d9699078b5a28652452387ce6e2f0c0c62024ced
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Sat Apr 22 14:17:29 2017 +0200

    Fix the paths in windows build

commit 5ba3b29b2fe379d4426e76679999be6af6d1eb49
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Apr 18 21:27:37 2017 +0200

    Missed another file extension change (win)

commit c9d559bb96a58b29049748cbe28a3006761cdece
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Fri Apr 14 11:05:30 2017 +0200

    Zip extension in meta.yaml

commit 90528ea30ac0cdf8bdd8edf646349f9270a093db
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Wed Apr 12 20:42:26 2017 +0200

    FIX File extensions for win

commit b174c1cae01a7e17e8141209777dc3ed00139463
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Apr 11 20:54:56 2017 +0200

    Bump version to 3.2.4

commit 1f49d2757e761787feba7a296fbae8afa6ececcf
Merge: 9b19308 b2a09a9
Author: Dan Allan <daniel.b.allan@gmail.com>
Date:   Sun Apr 16 16:48:59 2017 -0400

    Merge pull request #27 from jakirkham/various_osx_fixes
    
    Various OS X fixes

commit b2a09a9c6aeac378d9a84b65722b8b4e1dca4492
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:45:49 2017 -0400

    Bump build number to 5

commit 11219b220f35842976ec21d20e449f8993e9a23f
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:13:30 2017 -0400

    Require bzip2 and libiconv
    
    Was using the system copies of these on OS X and possibly on Linux. Have
    added them as explicit dependency to avoid this.

commit e9614440b40069c6a52ddbed3d6d5aadd280ddaf
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:08:13 2017 -0400

    Switch to sha256 for Unix source

commit c7b172bc0e8368175398103a42f405f48a61bba3
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:06:11 2017 -0400

    MNT: Re-rendered with conda-smithy 2.2.2

commit fe943106c2a53c23bc5e5a48c6d37bc46c1f0369
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:04:53 2017 -0400

    Use the toolchain

commit 2b0897256908d7078d6010220a0f5fdc6bbfa4fb
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:04:01 2017 -0400

    Package the GPL2 license file on Unix
    
    Not seeing the license for FFmpeg on Windows. Though they do ship tons
    of license with the package. Can revisit later.

commit 2657f34e84806516f3923ca57e76adcf76f331ea
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 14 13:03:28 2017 -0400

    Use 2-space indentation in `meta.yaml`

commit 9b1930889b8aed9713ddcf0b2d3901034585c6e1
Merge: 2915c6f 905244b
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Mon Jan 30 11:57:32 2017 +0100

    Merge pull request #21 from caspervdw/win-zeranoe
    
    Include windows headers

commit 905244befe09e7b9d0da599b7c50cdb5e10b79f5
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Sun Jan 29 13:47:10 2017 +0100

    MNT Re-rendered with conda-smithy 1.7.0

commit d347218832d3104be439521c39bdc5bf7c365708
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Thu Jan 26 21:32:11 2017 +0100

    Add SHA256 check

commit a69c1de9eadd67021af10966de7d5fb576b6b66e
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Wed Jan 25 09:06:16 2017 +0100

    Use robocopy to copy subdirs too

commit 4e34e07efb80f4eeeed7fb3bcc3500325deae4f7
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Jan 24 18:48:02 2017 +0100

    Use curl for downloading extra source

commit cec93a6e2616d494d2d17a160d34cb43d0c3193e
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Jan 24 15:40:49 2017 +0100

    Add myself to maintainers

commit b9703b2b2f732b400a7b7835cb337c68a0222db7
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Jan 24 15:02:12 2017 +0100

    Typo

commit 3d89bddbeca37f22cd8a832bd66a880956a22d1d
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Tue Jan 24 14:56:29 2017 +0100

    Include windows headers

commit 2915c6fbe504c1b7da689057e752619be65f19f2
Merge: 84c795b 6d547a6
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Wed Jan 18 15:12:14 2017 +0100

    Merge pull request #19 from caspervdw/win-zeranoe
    
    Add windows support by downloading the Zeranoe builds

commit 6d547a6d20ce76cf9baa60a617781b38045f0711
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Wed Jan 18 15:07:17 2017 +0100

    Change build number back to 3

commit 58208cb9d0ac96d80b80857863d3d105a42fb532
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Wed Jan 18 08:58:28 2017 +0100

    Fix windows URLs

commit d62bb86766f0a8250176189d80ccf22dcccb918f
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Mon Jan 16 08:40:16 2017 +0100

    MNT Re-rendered with conda-smithy 2.0.0

commit 1a1b71e4e2503c714a3969e8b0f2270bb7a7c074
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Sun Jan 15 22:26:20 2017 +0100

    Insert some spaces for the selectors

commit 859c756d52cfec9b0ffe641072e4a059be4d7beb
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Sun Jan 15 22:25:03 2017 +0100

    Fix typo in url

commit 8c4c0de82449bbb083305f7a87a6d47420e7b1b1
Author: Casper van der Wel <caspervdw@gmail.com>
Date:   Sun Jan 15 22:20:13 2017 +0100

    Add windows support by downloading the Zeranoe builds

commit 84c795b8e98d28e250819ee6237d9023922e9dbb
Merge: 01ef170 a51ce07
Author: jakirkham <jakirkham@gmail.com>
Date:   Wed Jan 4 11:22:06 2017 -0500

    Merge pull request #18 from jakirkham/re-render_master_1.7.0
    
    MNT: Re-rendered with conda-smithy 1.7.0 [ci skip]

commit a51ce07786b9965c9af8fae77cd2b65cad166f9c
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed Jan 4 04:59:05 2017 -0500

    MNT: Re-rendered with conda-smithy 1.7.0

commit 01ef17064f8706c1024180135b2cff319e494168
Merge: e31e536 80f55ba
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Wed Jan 4 10:49:33 2017 +0100

    Merge pull request #17 from 183amir/183amir-patch-1
    
    Update build.sh

commit 80f55baee8642dcd722ad30b03c0d1d6cc206234
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Tue Jan 3 23:18:01 2017 +0100

    Update build.sh
    
    unset the SUBDIR variable.

commit e31e53631ead9400c21cca2822e48a6d04f6be65
Merge: 7c38d09 52bdb0a
Author: Dan Allan <daniel.b.allan@gmail.com>
Date:   Sat Dec 3 14:25:18 2016 -0500

    Merge pull request #11 from conda-forge-admin/feedstock_version_pin_master
    
    MNT: Update pinned versions.

commit 52bdb0a9827da4cd8ba80341b9900a6197e8c653
Author: conda-forge-admin <conda-forge@googlegroups.com>
Date:   Sat Dec 3 02:08:04 2016 +0000

    MNT: Updated some of the pinned versions

commit 7c38d092f93743271ee1a39c090f86e4f24c6043
Merge: 62a3061 fa00707
Author: Phil Elson <pelson.pub@gmail.com>
Date:   Thu Jun 2 13:36:33 2016 +0100

    Merge pull request #3 from 183amir/enables
    
    Fix zlib. Add a test case.

commit fa007073d2a0136b235d08fd9ba6a83c4164ae74
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Wed May 4 11:37:45 2016 +0200

    Fix zlib. Add a test case.
    Add 183amir as a maintainer.

commit 62a306171b3aca59126e15970c2db4c2c75a151b
Merge: c2de5bc c3b5a01
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat May 14 16:57:23 2016 -0400

    Merge pull request #5 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock

commit c3b5a0192b1b3f07fdc885e1f3405547c34688e1
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat May 14 09:43:51 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 0.10.3.
    
    [ci skip]

commit c2de5bc0654b8483f9ceb67b21a56666c98a1ab6
Merge: 9bdc0a6 84333dc
Author: jakirkham <jakirkham@gmail.com>
Date:   Tue Apr 19 11:57:55 2016 -0400

    Merge pull request #1 from conda-forge-admin/feedstock_version_pin_master
    
    MNT: Update pinned versions.

commit 84333dc38615fd193398c311a9bbf0cfbafe530b
Author: conda-forge-admin <conda-forge@googlegroups.com>
Date:   Tue Apr 19 14:36:03 2016 +0100

    MNT: Updated some of the pinned versions

commit 9bdc0a6df9b41b7039a6377c222d11c7ece94d53
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Mon Apr 4 11:16:12 2016 +0000

    Re-render the feedstock after CI registration.

commit 48bf7b88f9b698c90927d45994481312c7c5356d
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Mon Apr 4 11:15:27 2016 +0000

    Initial commit of the ffmpeg feedstock.
