From caf7381d502a4e42a099eb56719f80cce00f3ac9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 24 Jun 2012 02:03:49 +0200 Subject: ffmpeg: fix mixup of old and new sinks Signed-off-by: Michael Niedermayer --- ffmpeg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index d7a44a84c3..be28d2b4b0 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -104,8 +104,6 @@ #define VSYNC_VFR 2 #define VSYNC_DROP 0xff -#define SINKA - const char program_name[] = "ffmpeg"; const int program_birth_year = 2000; @@ -1925,13 +1923,11 @@ static int poll_filters(void) !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) ret = av_buffersink_read_samples(ost->filter->filter, &picref, ost->st->codec->frame_size); - else -#ifdef SINKA + else if(ost->enc->type == AVMEDIA_TYPE_AUDIO) ret = av_buffersink_read(ost->filter->filter, &picref); -#else + else ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref, AV_BUFFERSINK_FLAG_NO_REQUEST); -#endif if (ret < 0) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { char buf[256]; -- cgit v1.2.3