[FFmpeg-devel] [PATCH] avfilter/graphparser: remove '\n' from parse_filter

[Muhammad Faiz]

On Sun, Jun 12, 2016 at 3:09 PM, Muhammad Faiz <mfcc64 at gmail.com> wrote:
> On Mon, Jun 6, 2016 at 12:19 AM, Muhammad Faiz <mfcc64 at gmail.com> wrote:
>> On Sun, Jun 5, 2016 at 12:33 AM, Michael Niedermayer
>> <michael at niedermayer.cc> wrote:
>>> On Thu, Jun 02, 2016 at 03:32:49PM +0700, Muhammad Faiz wrote:
>>>> On Thu, May 5, 2016 at 2:21 PM, Muhammad Faiz <mfcc64 at gmail.com> wrote:
>>>> > this allow a filter to be written like this:
>>>> > aformat =
>>>> >     sample_fmts  = fltp|flt:
>>>> >     sample_rates = 44100|44800
>>>> >
>>>> > Signed-off-by: Muhammad Faiz <mfcc64 at gmail.com>
>>>> > ---
>>>> >  libavfilter/graphparser.c | 4 ++--
>>>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>>>> >
>>>> > diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
>>>> > index 8d15b5d..03062af 100644
>>>> > --- a/libavfilter/graphparser.c
>>>> > +++ b/libavfilter/graphparser.c
>>>> > @@ -165,12 +165,12 @@ static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGr
>>>> >                          int index, void *log_ctx)
>>>> >  {
>>>> >      char *opts = NULL;
>>>> > -    char *name = av_get_token(buf, "=,;[\n");
>>>> > +    char *name = av_get_token(buf, "=,;[");
>>>> >      int ret;
>>>> >
>>>> >      if (**buf == '=') {
>>>> >          (*buf)++;
>>>> > -        opts = av_get_token(buf, "[],;\n");
>>>> > +        opts = av_get_token(buf, "[],;");
>>>> >      }
>>>> >
>>>> >      ret = create_filter(filt_ctx, graph, index, name, opts, log_ctx);
>>>> > --
>>>> > 2.5.0
>>>> >
>>>>
>>>> No response. So, I will try to explain this patch.
>>>> It allows filter definition to span across multiple lines.
>>>> This behaviour is useful to make filter graph more readable,
>>>> especially when stored on file.
>>>>
>>>> For example, using lavfi
>>>> ffplay -graph_file filter.txt -f lavfi my_lavfi
>>>> filter.txt:
>>>>
>>>> amovie=audio.mp3,
>>>> aformat=
>>>>     channel_layouts = stereo:
>>>>     sample_rates    = 48000:
>>>>     sample_fmts     = flt|fltp,
>>>> asplit [out0],
>>>> showcqt =
>>>>     tc = 0.33:
>>>>     fps = 60
>>>> [out1]
>>>
>>> Can this break (realistic) existing and documented as working cases ?
>>>
>>
>> This should not break any existing filter graph.
>> Previously, filter graph written like above will generate error.
>
> Is it OK if I apply this patch?
>
> Thank's

Applied anyway. It doesn't break fate.

Thank's