Skip to content

Commit

Permalink
Merge pull request #6 from peters/master
Browse files Browse the repository at this point in the history
Collection of small fixes for travis ci integration.
  • Loading branch information
manast committed Sep 14, 2012
2 parents 610089b + 1d62fab commit c4abb7e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
@@ -0,0 +1,8 @@
language: node_js
node_js:
- 0.8
- 0.6

before_install:
- sudo apt-get update
- sudo apt-get install ffmpeg libswscale-dev libavformat-dev libavcodec-dev libavutil-dev
3 changes: 1 addition & 2 deletions Readme.md
@@ -1,5 +1,4 @@

Node libavcodec bindings [![Build Status](https://secure.travis-ci.org/benvanik/node-transcoding.png)](http://travis-ci.org/benvanik/node-transcoding)
Node libavcodec bindings
= =


*navcodec* is a module that aims to provide a node wrapper for the excellent [libavcodec](http://libav.org) library. The module does not aim to make a 1 to 1 mapping between this library and javascript. Instead the aim is to create a new javascript API inspired by the underlying library that is more javascript oriented and easier to use. *navcodec* is a module that aims to provide a node wrapper for the excellent [libavcodec](http://libav.org) library. The module does not aim to make a 1 to 1 mapping between this library and javascript. Instead the aim is to create a new javascript API inspired by the underlying library that is more javascript oriented and easier to use.
Expand Down
3 changes: 1 addition & 2 deletions binding.gyp
Expand Up @@ -22,8 +22,7 @@
['OS=="linux"', { ['OS=="linux"', {
"cflags" : ["-g", "-D__STDC_CONSTANT_MACROS", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall"], "cflags" : ["-g", "-D__STDC_CONSTANT_MACROS", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall"],
"libraries" : ["-lavcodec","-lavformat","-lswscale","-lavutil"] "libraries" : ["-lavcodec","-lavformat","-lswscale","-lavutil"]

}]
}],
], ],
} }
] ]
Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -5,8 +5,7 @@
"version": "0.1.5", "version": "0.1.5",
"main": "./index.js", "main": "./index.js",
"scripts": { "scripts": {
"preinstall": "node-gyp configure build", "preuninstall": "make clean",
"preuninstall": "rm -rf build/*",
"pretest" : "make test" "pretest" : "make test"
}, },
"repository": { "repository": {
Expand Down

0 comments on commit c4abb7e

Please sign in to comment.