removed VideoFilter, since it is a worse version of the more general Filter, and fixed all the other input sources so that this would work

Author: Raveler

source/ffmpeg-cpp/decode_audio/decode_audio.cpp

@@ -21,7 +21,7 @@ class RawAudioFileSink : public AudioFrameSink, public FrameWriter
 		return stream;
 	}
 
-	virtual void WriteFrame(int streamIndex, AVFrame* frame, AVRational* timeBase)
+	virtual void WriteFrame(int streamIndex, AVFrame* frame, StreamData* streamData)
 	{
 		// Just write out the samples channel by channel to a file.
 		int data_size = av_get_bytes_per_sample((AVSampleFormat)frame->format);

source/ffmpeg-cpp/decode_video/decode_video.cpp

@@ -20,7 +20,7 @@ class PGMFileSink : public VideoFrameSink, public FrameWriter
 		return stream;
 	}
 
-	virtual void WriteFrame(int streamIndex, AVFrame* frame, AVRational* timeBase)
+	virtual void WriteFrame(int streamIndex, AVFrame* frame, StreamData* streamData)
 	{
 		++frameNumber;
 		printf("saving frame %3d\n", frameNumber);

source/ffmpeg-cpp/demo/GeneratedAudioSource.cpp

@@ -1,6 +1,6 @@
 #include "GeneratedAudioSource.h"
 
-GeneratedAudioSource::GeneratedAudioSource(AudioFrameSink* frameSink)
+GeneratedAudioSource::GeneratedAudioSource(FrameSink* frameSink)
 {
 	this->sampleRate = 44100;
 	this->channels = 2;

source/ffmpeg-cpp/demo/GeneratedAudioSource.h

@@ -8,7 +8,7 @@ class GeneratedAudioSource : public InputSource
 {
 public:
 
-	GeneratedAudioSource(AudioFrameSink* frameSink);
+	GeneratedAudioSource(FrameSink* frameSink);
 	~GeneratedAudioSource();
 
 	virtual void PreparePipeline();

source/ffmpeg-cpp/demo/GeneratedVideoSource.cpp

@@ -1,6 +1,6 @@
 #include "GeneratedVideoSource.h"
 
-GeneratedVideoSource::GeneratedVideoSource(int width, int height, VideoFrameSink* frameSink)
+GeneratedVideoSource::GeneratedVideoSource(int width, int height, FrameSink* frameSink)
 {
 	// generate a raw video source that will convert the raw format to any other format and pass it on to the encoder
 	// or any other sink (might be a filter as well).

source/ffmpeg-cpp/demo/GeneratedVideoSource.h

@@ -8,7 +8,7 @@ class GeneratedVideoSource : public InputSource
 {
 public:
 
-	GeneratedVideoSource(int width, int height, VideoFrameSink* frameSink);
+	GeneratedVideoSource(int width, int height, FrameSink* frameSink);
 	~GeneratedVideoSource();
 
 	virtual void PreparePipeline();

source/ffmpeg-cpp/demo/demo.cpp

@@ -174,16 +174,16 @@ void PlayDemo(int argc, char** argv)
 			* CONFIGURE VIDEO FILTER IF IT IS USED
 		*/
 
-		VideoFrameSink* videoFrameSink = videoEncoder;
+		FrameSink* videoFrameSink = videoEncoder;
 
 		// If a video filter was specified, we inject it into the pipeline here.
 		// Instead of feeding the video source directly to the encoder, we feed it to
 		// the video filter instead, which will pass it on to the encoder.
-		VideoFilter* videoFilter = nullptr;
+		Filter* videoFilter = nullptr;
 		if (videoFilterConfig != NULL && videoEncoder != nullptr)
 		{
 			printf("Applying filter %s to video...\n", videoFilterConfig);
-			videoFilter = new VideoFilter(videoFilterConfig, videoEncoder);
+			videoFilter = new Filter(videoFilterConfig, videoEncoder);
 			videoFrameSink = videoFilter; // used to feed the source below
 		}
 

source/ffmpeg-cpp/difference/difference.cpp

@@ -23,13 +23,13 @@ int main()
 		VideoEncoder* videoEncoder = new VideoEncoder(videoCodec, muxer);
 
 		// Create a video filter and do some funny stuff with the video data.
-		VideoFilter* filter = new VideoFilter("blend=all_mode=difference", videoEncoder);
+		Filter* filter = new Filter("blend=all_mode=difference", videoEncoder);
 		//VideoFilter* filter = new VideoFilter("overlay=0:0", videoEncoder);
 		//VideoFilter* filter = new VideoFilter("scale=100:800", videoEncoder);
 
 		// Create a video filter that will put a vignette on one of the video's,
 		// so that our difference filter van detect this.
-		VideoFilter* vignetteFilter = new VideoFilter("vignette", filter);
+		Filter* vignetteFilter = new Filter("vignette", filter);
 
 		// Load both video's
 		Demuxer* videoContainer1 = new Demuxer("samples/carphone.h264");