[FFmpeg-cvslog] ffmpeg: fix mixup of old and new sinks

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 24 02:03:49 2012 +0200| [caf7381d502a4e42a099eb56719f80cce00f3ac9] | committer: Michael Niedermayer

ffmpeg: fix mixup of old and new sinks

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=caf7381d502a4e42a099eb56719f80cce00f3ac9
---

 ffmpeg.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index d7a44a8..be28d2b 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];