[FFmpeg-devel] [PATCH] merge libavcore into libavutil

[Måns Rullgård]

Reinhard Tartler <siretart at tauware.de> writes:

> It is pretty hopeless that other projects will adopt libavutil alone in
> other projects. With this in mind, nobody is helped by having libavutil
> and libavcore split. In order to ease maintenance and reduce confusion
> where to put common code, avcore's functionality is merged (back) to
> avutil.

Nice work.

> diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
> new file mode 100644
> index 0000000..a6b3bb6
> --- /dev/null
> +++ b/libavutil/audioconvert.h
> @@ -0,0 +1,95 @@
> [...]
> +#ifndef AVUTILAUDIOCONVERT_H
> +#define AVUTILAUDIOCONVERT_H

AVUTIL_AUDIOCONVERT_H

BTW, the name of this file doesn't match what it does very well...

> diff --git a/libavutil/internal.h b/libavutil/internal.h
> index 36d3e71..b162207 100644
> --- a/libavutil/internal.h
> +++ b/libavutil/internal.h
> @@ -37,6 +37,9 @@
>  #include "config.h"
>  #include "attributes.h"
>  #include "timer.h"
> +#include "pixfmt.h"
> +
> +int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);

This belongs in imgutil.h, and it should have av_ prefix.

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