On Thu, Sep 19, 2013 at 10:26:36AM +0200, Vittorio Giovara wrote:
> --- a/libavutil/bswap.h
> +++ b/libavutil/bswap.h
> @@ -27,7 +27,8 @@
>  #define AVUTIL_BSWAP_H
>  
>  #include <stdint.h>
> -#include "libavutil/avconfig.h"
> +
> +#include "avconfig.h"
>  #include "attributes.h"

Try compiling out of tree.

> --- a/libavutil/common.h
> +++ b/libavutil/common.h
> @@ -36,7 +36,7 @@
>  
>  #include "attributes.h"
>  #include "version.h"
> -#include "libavutil/avconfig.h"
> +#include "avconfig.h"

same

> --- a/libavutil/cpu.h
> +++ b/libavutil/cpu.h
> @@ -23,9 +23,10 @@
>  
>  #include "version.h"
>  
> -#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags 
> (OR) */
> +/* force usage of selected flags (OR) */
> +#define AV_CPU_FLAG_FORCE    0x80000000
>  
> -    /* lower 16 bits - CPU features */
> +/* lower 16 bits - CPU features */
>  #define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
>  #define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD 
> MMX ext
>  #if FF_API_CPU_FLAG_MMX2

unrelated

> --- a/libavutil/des.c
> +++ b/libavutil/des.c
> @@ -18,8 +18,7 @@
>   * License along with Libav; if not, write to the Free Software
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
> USA
>   */
> -#include <inttypes.h>
> -#include "avutil.h"
> +
>  #include "common.h"
>  #include "intreadwrite.h"
>  #include "des.h"

This file needs stdint.h.

> --- a/libavutil/dict.c
> +++ b/libavutil/dict.c
> @@ -24,6 +24,7 @@
>  #include "dict.h"
>  #include "internal.h"
>  #include "mem.h"
> +#include "error.h"

I suggest maintaining alphabetical order.

> --- a/libavutil/frame.c
> +++ b/libavutil/frame.c
> @@ -25,6 +25,7 @@
>  #include "imgutils.h"
>  #include "mem.h"
>  #include "samplefmt.h"
> +#include "pixfmt.h"

same

> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -22,13 +22,11 @@
>  
>  #include <stdint.h>
>  
> -#include "libavcodec/version.h"
> -

A libavcodec #include in libavutil?  WTF?

> --- a/libavutil/imgutils.h
> +++ b/libavutil/imgutils.h
> @@ -28,6 +28,7 @@
>   */
>  
>  #include "avutil.h"
> +
>  #include "pixdesc.h"

This should remain as-is.

> --- a/libavutil/lfg.c
> +++ b/libavutil/lfg.c
> @@ -19,9 +19,9 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
> USA
>   */
>  
> -#include <inttypes.h>
>  #include <limits.h>
>  #include <math.h>
> +
>  #include "lfg.h"
>  #include "md5.h"
>  #include "intreadwrite.h"

This file needs stdint.h.

> --- a/libavutil/pixfmt.h
> +++ b/libavutil/pixfmt.h
> @@ -27,7 +27,7 @@
>  
> -#include "libavutil/avconfig.h"
> +#include "avconfig.h"
>  #include "version.h"

see above

> --- a/libavutil/rational.c
> +++ b/libavutil/rational.c
> @@ -25,12 +25,12 @@
>  
> -#include "avassert.h"
>  #include <limits.h>
>  
>  #include "common.h"
>  #include "mathematics.h"
>  #include "rational.h"
> +#include "avassert.h"

order

> --- a/libavutil/xtea.c
> +++ b/libavutil/xtea.c
> @@ -26,6 +26,7 @@
>  #include "intreadwrite.h"
>  #include "xtea.h"
>  
> +
>  void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])
>  {
>      int i;

stray change

Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to