[Ffmpeg-devel] [PATCH] Merge some changes from xine-lib's ffmpeg patch

[Michael Niedermayer]

Hi

[...]

> diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
> index a3b7cf3..003f438 100644
> --- a/libavcodec/dsputil.c
> +++ b/libavcodec/dsputil.c
> @@ -360,6 +360,8 @@ #ifdef CONFIG_SNOW_ENCODER //dwt is in s
>      }
>      assert(s>=0);
>      return s>>9;
> +#else
> +    return 0;
>  #endif

this is silly, the whole function shouldnt be compiled if it cant be, not just
returning a incorrect value ...


>  }
>  
> diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
> index 73165e7..588485a 100644
> --- a/libavcodec/interplayvideo.c
> +++ b/libavcodec/interplayvideo.c
> @@ -49,7 +49,11 @@ #define DEBUG_INTERPLAY 0
>  #if DEBUG_INTERPLAY
>  #define debug_interplay(x,...) av_log(NULL, AV_LOG_DEBUG, x, __VA_ARGS__)
>  #else
> -static inline void debug_interplay(const char *format, ...) { }
> +static inline void
> +#ifdef __GNUC__
> +__attribute__ ((__format__ (__printf__, 1, 2)))
> +#endif
> +debug_interplay(const char *format, ...) { }
>  #endif

i leave this to the interplayvideo.c maintainer to decide



>  
>  typedef struct IpvideoContext {
> diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
> index d2c9efb..6a18b1c 100644
> --- a/libavcodec/truemotion1.c
> +++ b/libavcodec/truemotion1.c
> @@ -353,6 +353,13 @@ static int truemotion1_decode_header(Tru
>      header.header_type = header_buffer[10];
>      header.flags = header_buffer[11];
>      header.control = header_buffer[12];
> +    
> +    /* These are not used a part from in the FLAG_SPRITE part, but that seems
> +       not to be complete anyway */
> +    header.width = 0;
> +    header.height = 0;
> +    header.xoffset = 0;
> +    header.yoffset = 0;

is the comment supposed to make sense?


>  
>      /* Version 2 */
>      if (header.version >= 2)
> @@ -918,4 +925,5 @@ AVCodec truemotion1_decoder = {
>      truemotion1_decode_end,
>      truemotion1_decode_frame,
>      CODEC_CAP_DR1,
> +    NULL, NULL, NULL, NULL

rejected, this change is random, inconsistent and unneeded


>  };
> diff --git a/libavutil/common.h b/libavutil/common.h
> index ae32512..c951f5b 100644
> --- a/libavutil/common.h
> +++ b/libavutil/common.h
> @@ -288,7 +288,7 @@ #    endif
>  
>  /* debug stuff */
>  
> -#    ifndef DEBUG
> +#    if !defined(DEBUG) && !defined(NDEBUG)
>  #        define NDEBUG
>  #    endif
>  #    include <assert.h>

what is the purpose of this change?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In the past you could go to a library and read, borrow or copy any book
Today you'd get arrested for mere telling someone where the library is