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

[Diego Biurrun]

On Mon, Feb 07, 2011 at 07:27:26PM +0100, Reinhard Tartler wrote:
> 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 :)

> --- a/libavformat/applehttp.c
> +++ b/libavformat/applehttp.c
> @@ -26,6 +26,7 @@
>   */
>  
>  #define _XOPEN_SOURCE 600
> +#include "libavutil/avutil.h"
>  #include "libavutil/avstring.h"
>  #include "avformat.h"
>  #include "internal.h"

Why?

> --- /dev/null
> +++ b/libavutil/audioconvert.h
> @@ -0,0 +1,95 @@
> +
> +#ifndef AVUTILAUDIOCONVERT_H
> +#define AVUTILAUDIOCONVERT_H

AVUTIL_

> --- /dev/null
> +++ b/libavutil/samplefmt.c
> @@ -0,0 +1,73 @@
> +
> +#include "samplefmt.h"
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>

unrelated: Local headers should come after system headers.

Diego