Skip to content

Commit

Permalink
Removing nameCompat.h
Browse files Browse the repository at this point in the history
This let us build ffmpeg-light on Travis CI, but it was a gross hack to
just let the compiler work by providing dummy definitions of things in
ffmpeg added more recently than the ancient version available on the
Travis infrastructure.

Maintaining these shims so as to work with multiple versions of ffmpeg
is not worth the trouble.
  • Loading branch information
acowley committed Mar 10, 2016
1 parent 5aa559f commit d9e6348
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.11.0

* Query stream duration (Matthias Treydte)

# 0.10. 0

* Fix encoder bug that created a single black frame at the start of
Expand Down
4 changes: 2 additions & 2 deletions ffmpeg-light.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: ffmpeg-light
version: 0.10.0
version: 0.11.0
synopsis: Minimal bindings to the FFmpeg library.

description: Stream frames from an encoded video, or stream frames to
Expand Down Expand Up @@ -27,7 +27,7 @@ homepage: http://github.com/acowley/ffmpeg-light
bug-reports: http://github.com/acowley/ffmpeg-light/issues
category: Codec
build-type: Simple
extra-source-files: src/hscMacros.h, src/nameCompat.h, CHANGELOG.md
extra-source-files: src/hscMacros.h, CHANGELOG.md
cabal-version: >=1.10

source-repository head
Expand Down
8 changes: 0 additions & 8 deletions src/Codec/FFmpeg/Enums.hsc
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ import Foreign.Storable (Storable)
#include <libavutil/mathematics.h>
#include <libswscale/swscale.h>

#ifndef PIX_FMT_RGBA64
-- WARNING: Fragile! This pixel format is not defined in older
-- versions. Note that many FFI calls will fail at runtime with older
-- versions, so all this does is let us the haskell code.
#warning "This version of libav/ffmpeg is too old. It is not likely to work."
#include "nameCompat.h"
#endif

newtype AVMediaType = AVMediaType CInt deriving (Eq, Storable)
#enum AVMediaType,AVMediaType \
, AVMEDIA_TYPE_VIDEO\
Expand Down

0 comments on commit d9e6348

Please sign in to comment.