[FFmpeg-devel] [PATCH] samplefmt: add missing include.

[Måns Rullgård]

avcoder <ffmpeg at gmail.com> writes:

>> On Thu, Feb 17, 2011 at 8:42 PM, Janne Grunau <janne-ffmpeg at jannau.net>wrote:
>>
>>> On Thu, Feb 17, 2011 at 12:34:27PM +0000, M?ns Rullg?rd wrote:
>>> > Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
>>> >
>>> > > Add missing inclusion of "avutil.h" to samplefmt.h. This is required,
>>> > > to make the header usable without the explicit inclusion of further
>>> > > headers in files using it.
>>> > > ---
>>> > >  libavutil/samplefmt.h |    2 ++
>>> > >  1 files changed, 2 insertions(+), 0 deletions(-)
>>> > >
>>> > > diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h
>>> > > index 0604580..9739d77 100644
>>> > > --- a/libavutil/samplefmt.h
>>> > > +++ b/libavutil/samplefmt.h
>>> > > @@ -19,6 +19,8 @@
>>> > >  #ifndef AVUTIL_SAMPLEFMT_H
>>> > >  #define AVUTIL_SAMPLEFMT_H
>>> > >
>>> > > +#include "avutil.h"
>>> > > +
>>> >
>>> > Why?  I don't see anything in samplefmt.h referencing anything defined
>>> > in avutil.h.
>>>
>>> indeed, make checkheaders passes too without this change, dropped
>
> Disagree,make checkheaders reports error at least in MinGW
>
> gcc -I. -I"/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DHAVE_AV_CONFIG_H
> -DREDIRECT_DEBUG_LOG -D_WIN32_WINNT=0x0501 -U__STRICT_ANSI__
> -fno-strict-aliasing -I/usr/local/include -I/usr/local/include/pthreads
> -march=pentium2 -std=c99 -fno-common -DHAVE_CONFIG_H
> -IE:/msys/local/include/aacplus -I/usr/local/lib
> -IE:/msys/local/include/schroedinger-1.0 -IE:/msys/local/include/orc-0.4 -g3
> -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch
> -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign
> -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes
>  -fno-math-errno -fno-signed-zeros -fno-tree-vectorize
> -Werror=implicit-function-declaration -Werror=missing-prototypes
>  -Wno-unused -c -o libavfilter/vsrc_buffer.ho -x c libavfilter/vsrc_buffer.h
> In file included from ./libavcodec/avcodec.h:30:0,
>                  from libavfilter/vsrc_buffer.h:22:
> ./libavutil/samplefmt.h:87:36: error: expected ')' before '*' token
> ./libavutil/samplefmt.h:104:30: error: expected ')' before '*' token

samplefmt.h doesn't have that many lines.

> make: *** [libavfilter/vsrc_buffer.ho] Error 1
>
> but the patch should add:
>
> #include <stdint.h>
>
> instead of
>
> #include <avutil.h>

No, samplefmt.h does not use anything from stdint.h.

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