@@ -1,6 +1,6 @@ require 'rubygems' require 'ffmpeg' -require 'rmagick' +require 'RMagick' video = FFMPEG::InputFormat.new('spec/data/alligator.mp4') stream = video.first_video_stream animated_gif_example.rb @@ -2,8 +2,8 @@ * Licensed under the Ruby License. See LICENSE for details. * */ -#ifndef __FFMPEG_H__ -#define __FFMPEG_H__ +#ifndef RUBY_FFMPEG_H__ +#define RUBY_FFMPEG_H__ #include <libavformat/avformat.h> #include <libavutil/avutil.h> ext/ffmpeg.h @@ -41,7 +41,6 @@ format_duration(VALUE self) static VALUE format_streams(VALUE self) { - int size; int i; AVFormatContext * format_context = get_format_context(self); volatile VALUE streams = rb_ary_new2(format_context->nb_streams); @@ -152,10 +151,6 @@ init_format(VALUE self) return self; } -static void -mark_format(AVFormatContext * format_context) -{} - static void free_format(AVFormatContext * format_context) { ext/ffmpeg_format.c @@ -121,7 +121,6 @@ extract_next_frame(AVFormatContext * format_context, AVCodecContext * codec_cont int remaining = 0; int decoded; int frame_complete = 0; - int ret; int next; while(!frame_complete && ext/ffmpeg_stream.c @@ -2,8 +2,8 @@ * Licensed under the Ruby License. See LICENSE for details. * */ -#ifndef __FFMPEG_UTILS_H__ -#define __FFMPEG_UTILS_H__ +#ifndef RUBY_FFMPEG_UTILS_H__ +#define RUBY_FFMPEG_UTILS_H__ #include "ffmpeg.h" @@ -15,5 +15,4 @@ AVFrame * get_frame(VALUE self); VALUE rb_sym(const char *s); VALUE codec_type_id_to_sym(int codec_type); -#endif __FFMPEG_UTILS_H__ - +#endif ext/ffmpeg_utils.h @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../ext/FFMPEG' +require File.dirname(__FILE__) + '/../ext/ffmpeg' include FFMPEG Spec::Runner.configure do |config| spec/spec_helper.rb 1669be6a886105a899073d0912fa17385460a1ff Todd A. Fisher taf2@web3.anerian.com http://github.com/gwik/ffmpeg-ruby/commit/2e76e6d08c1598fa679ddb349d3ea167d9e514a1 2e76e6d08c1598fa679ddb349d3ea167d9e514a1 2008-12-01T13:29:38-08:00 2008-12-01T13:29:38-08:00 include ruby in the headers fix a few warnings use ffmpeg instead of FFMPEG in specs 26ca7f80dd0993b655bfefb4b34b709cb3a6cf07 Todd A. Fisher taf2@web3.anerian.com