[FFmpeg-devel] [PATCH 3/3] Export metadata in the generic format.

[Michael Niedermayer]

On Tue, Oct 12, 2010 at 09:37:32PM +0200, Anton Khirnov wrote:
> On Tue, Oct 12, 2010 at 09:12:31PM +0200, Michael Niedermayer wrote:
> > On Tue, Oct 12, 2010 at 07:35:17PM +0200, Anton Khirnov wrote:
> > > On Mon, Oct 11, 2010 at 10:33:21PM +0200, Michael Niedermayer wrote:
> > > > On Tue, Oct 05, 2010 at 07:57:06PM +0200, Anton Khirnov wrote:
> > > > 
> > > > thats a strange place for it one would expect it at the end of the header
> > > > reading code
> > > > 
> > > > 
> > > [...]
> > > > 
> > > > same as asf odd place, there could be multipl info tags
> > > > and the same applies to other changes too
> > > > 
> > > Better now?
> > > 
> > > I've also removed the conv tables from (de)muxers completely instead of
> > > just ifdefing them, since NULL is also a perfeclty valid conv table.
> > [...]
> > > diff --git a/libavformat/metadata.c b/libavformat/metadata.c
> > > index 8fc1771..713304b 100644
> > > --- a/libavformat/metadata.c
> > > +++ b/libavformat/metadata.c
> > > @@ -140,8 +140,8 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
> > >      *pm = dst;
> > >  }
> > >  
> > > -void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
> > > -                                            const AVMetadataConv *s_conv)
> > > +void metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
> > 
> > ff_ prefix
> done
> 
> i guess metadata_conv() should get a ff_ prefix too, i'll send a patch
> for this later
> 
> -- 
> Anton Khirnov

>  doc/APIchanges               |    5 +++++
>  libavformat/asfdec.c         |    3 ++-
>  libavformat/asfenc.c         |    4 ++--
>  libavformat/avformat.h       |   28 +++++++++++++++-------------
>  libavformat/avidec.c         |    3 ++-
>  libavformat/avienc.c         |    9 ++-------
>  libavformat/flacdec.c        |    1 -
>  libavformat/flacenc.c        |    1 -
>  libavformat/id3v2.c          |    2 ++
>  libavformat/matroskadec.c    |    2 +-
>  libavformat/matroskaenc.c    |    4 ++--
>  libavformat/metadata.c       |   10 ++++++++--
>  libavformat/metadata.h       |    2 ++
>  libavformat/mp3.c            |    4 +---
>  libavformat/nutdec.c         |    3 ++-
>  libavformat/nutenc.c         |    3 ++-
>  libavformat/oggdec.c         |    1 -
>  libavformat/oggenc.c         |    1 -
>  libavformat/oggparsevorbis.c |    3 +++
>  libavformat/oma.c            |    1 -
>  libavformat/vorbiscomment.c  |    1 +
>  21 files changed, 52 insertions(+), 39 deletions(-)
> 00e050e1c32007f41bc05be2e4e8a38f5f2bbba4  0001-Export-metadata-in-the-generic-format.patch
> From d49b7fc3c1a830aef78b4b238d7688a565119f95 Mon Sep 17 00:00:00 2001
> From: Anton Khirnov <anton at khirnov.net>
> Date: Tue, 5 Oct 2010 12:25:49 +0200
> Subject: [PATCH] Export metadata in the generic format.
> 
> deprecate old conversion API.

should be ok if tested

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

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- 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/20101012/123d3c0f/attachment.pgp>