diff mbox series

[FFmpeg-devel,v1,1/2] avfilter/vf_subtitles: remove unneeded ifdef

Message ID 20200330105233.12878-1-lance.lmwang@gmail.com
State New
Headers show
Series [FFmpeg-devel,v1,1/2] avfilter/vf_subtitles: remove unneeded ifdef
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Limin Wang March 30, 2020, 10:52 a.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavfilter/vf_subtitles.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Limin Wang May 3, 2020, 12:55 p.m. UTC | #1
On Mon, Mar 30, 2020 at 06:52:32PM +0800, lance.lmwang@gmail.com wrote:
> From: Limin Wang <lance.lmwang@gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  libavfilter/vf_subtitles.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
> index a3b4029af4..2f312b0ba8 100644
> --- a/libavfilter/vf_subtitles.c
> +++ b/libavfilter/vf_subtitles.c
> @@ -30,10 +30,8 @@
>  #include <ass/ass.h>
>  
>  #include "config.h"
> -#if CONFIG_SUBTITLES_FILTER
> -# include "libavcodec/avcodec.h"
> -# include "libavformat/avformat.h"
> -#endif
> +#include "libavcodec/avcodec.h"
> +#include "libavformat/avformat.h"
>  #include "libavutil/avstring.h"
>  #include "libavutil/imgutils.h"
>  #include "libavutil/opt.h"
> -- 
> 2.21.0
> 

ping
Andreas Rheinhardt May 3, 2020, 1:35 p.m. UTC | #2
lance.lmwang@gmail.com:
> On Mon, Mar 30, 2020 at 06:52:32PM +0800, lance.lmwang@gmail.com wrote:
>> From: Limin Wang <lance.lmwang@gmail.com>
>>
>> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
>> ---
>>  libavfilter/vf_subtitles.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
>> index a3b4029af4..2f312b0ba8 100644
>> --- a/libavfilter/vf_subtitles.c
>> +++ b/libavfilter/vf_subtitles.c
>> @@ -30,10 +30,8 @@
>>  #include <ass/ass.h>
>>  
>>  #include "config.h"
>> -#if CONFIG_SUBTITLES_FILTER
>> -# include "libavcodec/avcodec.h"
>> -# include "libavformat/avformat.h"
>> -#endif
>> +#include "libavcodec/avcodec.h"
>> +#include "libavformat/avformat.h"
>>  #include "libavutil/avstring.h"
>>  #include "libavutil/imgutils.h"
>>  #include "libavutil/opt.h"
>> -- 
>> 2.21.0
>>
> 
> ping 
> 
Why is this supposed to be unneeded? This file contains two filters: The
subtitles and the ass filter, so it is possible for this file to be
compiled if the subtitles filter is disabled.

- Andreas
Limin Wang May 3, 2020, 2:18 p.m. UTC | #3
On Sun, May 03, 2020 at 03:35:19PM +0200, Andreas Rheinhardt wrote:
> lance.lmwang@gmail.com:
> > On Mon, Mar 30, 2020 at 06:52:32PM +0800, lance.lmwang@gmail.com wrote:
> >> From: Limin Wang <lance.lmwang@gmail.com>
> >>
> >> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> >> ---
> >>  libavfilter/vf_subtitles.c | 6 ++----
> >>  1 file changed, 2 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
> >> index a3b4029af4..2f312b0ba8 100644
> >> --- a/libavfilter/vf_subtitles.c
> >> +++ b/libavfilter/vf_subtitles.c
> >> @@ -30,10 +30,8 @@
> >>  #include <ass/ass.h>
> >>  
> >>  #include "config.h"
> >> -#if CONFIG_SUBTITLES_FILTER
> >> -# include "libavcodec/avcodec.h"
> >> -# include "libavformat/avformat.h"
> >> -#endif
> >> +#include "libavcodec/avcodec.h"
> >> +#include "libavformat/avformat.h"
> >>  #include "libavutil/avstring.h"
> >>  #include "libavutil/imgutils.h"
> >>  #include "libavutil/opt.h"
> >> -- 
> >> 2.21.0
> >>
> > 
> > ping 
> > 
> Why is this supposed to be unneeded? This file contains two filters: The
> subtitles and the ass filter, so it is possible for this file to be
> compiled if the subtitles filter is disabled.

Oh, yes, ass don't need include the header, I haven't tested such condition.
please ignore the patch.

> 
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index a3b4029af4..2f312b0ba8 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -30,10 +30,8 @@ 
 #include <ass/ass.h>
 
 #include "config.h"
-#if CONFIG_SUBTITLES_FILTER
-# include "libavcodec/avcodec.h"
-# include "libavformat/avformat.h"
-#endif
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
 #include "libavutil/avstring.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"