[FFmpeg-devel] [PATCH] ffmpeg.c: disable av_vsrc_buffer_add_frame() when buffer filter is disabled

[Peter Ross]

On Sun, May 30, 2010 at 12:58:25PM +0100, M?ns Rullg?rd wrote:
> Peter Ross <pross at xvid.org> writes:
> 
> > On Sun, May 30, 2010 at 12:41:27PM +0100, M?ns Rullg?rd wrote:
> >> Peter Ross <pross at xvid.org> writes:
> >> 
> >> > On Sun, May 30, 2010 at 04:42:51AM +0200, Michael Niedermayer wrote:
> >> >> On Sun, May 30, 2010 at 12:39:35PM +1000, Peter Ross wrote:
> >> >> > On Sun, May 30, 2010 at 02:46:40AM +0100, M?ns Rullg?rd wrote:
> >> >> > > Peter Ross <pross at xvid.org> writes:
> >> >> > > 
> >> >> > > > $subject
> >> >> > > >
> >> >> > > > -- Peter
> >> >> > > > (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
> >> >> > > >
> >> >> > > > diff --git a/ffmpeg.c b/ffmpeg.c
> >> >> > > > index 63f0e6b..b0dfcff 100644
> >> >> > > > --- a/ffmpeg.c
> >> >> > > > +++ b/ffmpeg.c
> >> >> > > > @@ -1651,7 +1651,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
> >> >> > > >                                      &buffer_to_free);
> >> >> > > >          }
> >> >> > > >  
> >> >> > > > -#if CONFIG_AVFILTER
> >> >> > > > +#if CONFIG_AVFILTER && CONFIG_BUFFER_FILTER
> >> >> > > >          if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ist->input_video_filter) {
> >> >> > > >              // add it to be filtered
> >> >> > > >              av_vsrc_buffer_add_frame(ist->input_video_filter, &picture,
> >> >> > > 
> >> >> > > This doesn't work.
> >> >> > 
> >> >> > Okay. So what are our options?
> >> >> > 
> >> >> > 1. require the buffer filter to always be present when libavfilter is enabled
> >> >> 
> >> >> sounds reasonable
> >> >
> >> > Fix enclosed.
> >> >
> >> > -- Peter
> >> > (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
> >> >
> >> > diff --git a/configure b/configure
> >> > index 226e59c..c24a2d5 100755
> >> > --- a/configure
> >> > +++ b/configure
> >> > @@ -1426,6 +1426,7 @@ avformat_deps="avcodec"
> >> >  
> >> >  # programs
> >> >  ffmpeg_deps="avcodec avformat swscale"
> >> > +ffmpeg_select="buffer_filter"
> >> >  ffplay_deps="avcodec avformat swscale sdl"
> >> >  ffplay_select="rdft"
> >> >  ffprobe_deps="avcodec avformat"
> >> 
> >> Shouldn't avfilter be added to ffmpeg_deps as well?
> >
> > Seperate patch? libavfilter is not currently required to compile ffmpeg.c.
> 
> How can it require one specific filter but not libavfilter as a whole?

because the libavfilter section is wrapped in #ifdef CONFIG_AVFILTER
*but* inside those sections in an explicit references to a buffer filter symbol.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20100530/70caf56c/attachment.pgp>