[FFmpeg-devel] [PATCH 1/2] avformat/tee: Factor parse_slave_options() out

[Michael Niedermayer]

On Tue, Aug 02, 2016 at 04:42:56PM +0200, Nicolas George wrote:
> Le quintidi 15 thermidor, an CCXXIV, Michael Niedermayer a écrit :
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
[...]
> > +int ff_tee_parse_slave_options(void *log, char *slave,
> > +                               AVDictionary **options, char **filename)
> > +{
> > +    const char *p;
> > +    char *key, *val;
> > +    int ret;
> > +
> > +    if (!strspn(slave, slave_opt_open)) {
> > +        *filename = slave;
> > +        return 0;
> > +    }
> > +    p = slave + 1;
> > +    if (strspn(p, slave_opt_close)) {
> > +        *filename = (char *)p + 1;
> > +        return 0;
> > +    }
> > +    while (1) {
> > +        ret = av_opt_get_key_value(&p, "=", slave_opt_delim, 0, &key, &val);
> > +        if (ret < 0) {
> > +            av_log(log, AV_LOG_ERROR, "No option found near \"%s\"\n", p);
> > +            goto fail;
> > +        }
> > +        ret = av_dict_set(options, key, val,
> > +                          AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
> > +        if (ret < 0)
> > +            goto fail;
> > +        if (strspn(p, slave_opt_close))
> > +            break;
> > +        p++;
> > +    }
> > +    *filename = (char *)p + 1;
> > +    return 0;
> > +
> > +fail:
> > +    av_dict_free(options);
> > +    return ret;
> > +}
> 
> > \ No newline at end of file
> 
> Better fix that. It happened several times recently, maybe check the config
> of your editor?

i dont think my editor supports that, but it really shouldnt matter,
theres a git hook that prevents this from being checked in, so it
will get fixed before i push it


> 
> > diff --git a/libavformat/tee_common.h b/libavformat/tee_common.h
> > new file mode 100644
> > index 0000000..78ef1b8
> > --- /dev/null
> > +++ b/libavformat/tee_common.h
> > @@ -0,0 +1,31 @@
> > +/*
> > + * Tee common code
> 
> > + * Copyright (c) 2012 Nicolas George
> 
> I do not think this specific file warrants any copyright from me. Either
> yourself or "the FFmpeg developers" would be better I think.

fixed


> 
> > + *
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public License
> > + * as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public License
> > + * along with FFmpeg; if not, write to the Free Software * Foundation, Inc.,
> > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> > + */
> > +
> > +#ifndef AVFORMAT_TEE_COMMON_H
> > +#define AVFORMAT_TEE_COMMON_H
> > +
> > +#include "libavutil/dict.h"
> > +
> > +int ff_tee_parse_slave_options(void *log, char *slave,
> > +                               AVDictionary **options, char **filename);
> > +
> > +#endif
> 
> > +
> 
> Stray empty line.

fixed


> 
> LGTM apart from that, but maybe ask Jan if it will not interfere with his
> work.

applied as jan is ok with it too

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Old school: Use the lowest level language in which you can solve the problem
            conveniently.
New school: Use the highest level language in which the latest supercomputer
            can solve the problem without the user falling asleep waiting.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160802/9d861be4/attachment.sig>