diff -rU 3 ../util/ffmpeg/AVFormat/v55/libavformat_h.jl AVFormat/v55/libavformat_h.jl
--- ../util/ffmpeg/AVFormat/v55/libavformat_h.jl	2014-07-20 18:38:57.354906745 -0700
+++ AVFormat/v55/libavformat_h.jl	2014-07-20 18:44:53.690900364 -0700
@@ -1518,9 +1518,9 @@
     offset_timebase::AVRational
     internal::Ptr{AVFormatInternal}
     io_repositioned::Cint
-    video_codec::Ptr{AVCodec}
-    audio_codec::Ptr{AVCodec}
-    subtitle_codec::Ptr{AVCodec}
+    video_codec::Ptr{AVCodec_}
+    audio_codec::Ptr{AVCodec_}
+    subtitle_codec::Ptr{AVCodec_}
     metadata_header_padding::Cint
     opaque::Ptr{Void}
     control_message_cb::av_format_control_message
diff -rU 3 ../util/ffmpeg/AVFormat/v55/LIBAVFORMAT.jl AVFormat/v55/LIBAVFORMAT.jl
--- ../util/ffmpeg/AVFormat/v55/LIBAVFORMAT.jl	2014-07-20 18:38:57.354906745 -0700
+++ AVFormat/v55/LIBAVFORMAT.jl	2014-07-20 18:06:24.318941720 -0700
@@ -1,4 +1,4 @@
 include("libavformat_h.jl")
 
-#include("avformat.jl")
+include("avformat.jl")
 #include("avio.jl")
