[FFmpeg-devel] [PATCH] Implement read_file() cmdutils.c option

[Michael Niedermayer]

On Thu, Apr 01, 2010 at 01:03:32AM +0200, Stefano Sabatini wrote:
> On date Wednesday 2010-03-31 23:32:09 +0200, Michael Niedermayer encoded:
> > On Wed, Mar 31, 2010 at 10:06:33PM +0200, Stefano Sabatini wrote:
> [...]
> > > Subject: [PATCH 1/2] Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading
> > >  the second pass encoding log file.
> > > 
> > > ---
> > >  cmdutils.c |   23 +++++++++++++++++++++++
> > >  cmdutils.h |   11 +++++++++++
> > >  ffmpeg.c   |   21 ++++-----------------
> > >  3 files changed, 38 insertions(+), 17 deletions(-)
> > > 
> > > diff --git a/cmdutils.c b/cmdutils.c
> > > index c2c44c6..8c5561c 100644
> > > --- a/cmdutils.c
> > > +++ b/cmdutils.c
> > > @@ -639,3 +639,26 @@ int read_yesno(void)
> > >  
> > >      return yesno;
> > >  }
> > > +
> > > +int read_file(const char *filename, char **bufptr, size_t *size)
> > > +{
> > > +    FILE *f = fopen(filename, "r");
> > > +
> > > +    if (!f) {
> > > +        fprintf(stderr, "Cannot read file '%s': %s\n", filename, strerror(errno));
> > > +        return AVERROR(errno);
> > > +    }
> > > +    fseek(f, 0, SEEK_END);
> > > +    *size = ftell(f);
> > > +    fseek(f, 0, SEEK_SET);
> > > +    *bufptr = av_malloc(*size + 1);
> > > +    if (!*bufptr) {
> > > +        fprintf(stderr, "Could not allocate file buffer\n");
> > > +        return AVERROR(ENOMEM);
> > > +    }
> > 
> > missing fclose()
> 
> Ouch, fixed, regards.
> -- 
> FFmpeg = Formidable Fierce Mastering Peaceful Earthshaking Game

>  cmdutils.c |   24 ++++++++++++++++++++++++
>  cmdutils.h |   11 +++++++++++
>  ffmpeg.c   |   21 ++++-----------------
>  3 files changed, 39 insertions(+), 17 deletions(-)
> c35038d6808ce696d5f1a8dcc0dd8df1b5c56ca6  0001-Implement-cmdutils.c-read_file-and-use-it-in-ffmpeg..patch
> >From bad7052f9c1635089c4eeb27d9593941fa4f7fc8 Mon Sep 17 00:00:00 2001
> From: Stefano Sabatini <stefano.sabatini-lala at poste.it>
> Date: Sun, 28 Mar 2010 16:38:42 +0200
> Subject: [PATCH 1/2] Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading
>  the second pass encoding log file.

should be ok

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus
-------------- 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/20100401/6b93b107/attachment.pgp>