[FFmpeg-devel] [PATCH 7/7] avio: avio_ prefix for url_fgetc

[Michael Niedermayer]

On Sun, Mar 06, 2011 at 01:30:51PM -0500, Ronald S. Bultje wrote:
> Hi,
> 
> On Sun, Mar 6, 2011 at 12:04 PM, Anton Khirnov <anton at khirnov.net> wrote:
> > diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
> [..]
> > @@ -229,15 +229,15 @@ ogg_read_page (AVFormatContext * s, int *str)
> > ? ? ? ? return -1;
> > ? ? }
> >
> > - ? ?if (url_fgetc (bc) != 0) ? ? ?/* version */
> > + ? ?if (avio_getc(bc) != 0) ? ? ?/* version */
> > ? ? ? ? return -1;
> >
> > - ? ?flags = url_fgetc (bc);
> > + ? ?flags = avio_getc(bc);
> > ? ? gp = avio_rl64 (bc);
> > ? ? serial = avio_rl32 (bc);
> > ? ? seq = avio_rl32 (bc);
> > ? ? crc = avio_rl32 (bc);
> > - ? ?nsegs = url_fgetc (bc);
> > + ? ?nsegs = avio_getc(bc);
> >
> > ? ? idx = ogg_find_stream (ogg, serial);
> > ? ? if (idx < 0){
> 
> Why do these use fgetc()?

yeah, why?


9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 221)         c = url_fgetc (bc);
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 222)         if (c < 0)
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 223)             return -1;
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 224)         sync[sp++ & 3] = c;
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 225)     }while (i++ < MAX_PAGE_SIZE);
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 226)
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 227)     if (i >= MAX_PAGE_SIZE){
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 228)         av_log (s, AV_LOG_INFO, "ogg, can't find sync word\n");
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 229)         return -1;
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 230)     }
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 231)
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 232)     if (url_fgetc (bc) != 0)      /* version */
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 233)         return -1;
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 234)
9146ca37 libavformat/ogg2.c   (M?ns Rullg?rd      2005-04-09 15:32:58 +0000 235)     flags = url_fgetc (bc);

commit 9146ca3700a83c267b0f505a38c26b69992beb7d
Author: M?ns Rullg?rd <mans at mansr.com>
Date:   Sat Apr 9 15:32:58 2005 +0000

    Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
    fixups by me.

    Originally committed as revision 4113 to svn://svn.ffmpeg.org/ffmpeg/trunk


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is not what we do, but why we do it that matters.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20110306/15b9dbbd/attachment.pgp>