[FFmpeg-devel] [PATCH] lavf: make ff_guidcmp inline and move it to asf.h

Måns Rullgård mans
Wed Feb 9 13:14:01 CET 2011


Anton Khirnov <anton at khirnov.net> writes:

> ---
>  libavformat/asf.h    |    5 ++++-
>  libavformat/asfdec.c |    5 -----
>  2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/asf.h b/libavformat/asf.h
> index f336c43..2408a14 100644
> --- a/libavformat/asf.h
> +++ b/libavformat/asf.h
> @@ -230,7 +230,10 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
>  #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
>
>  extern AVInputFormat ff_asf_demuxer;
> -int ff_guidcmp(const void *g1, const void *g2);
> +static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
> +{
> +    return memcmp(g1, g2, sizeof(ff_asf_guid));
> +}
>  void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);

I'd put blank lines around that function.

-- 
M?ns Rullg?rd
mans at mansr.com



More information about the ffmpeg-devel mailing list