[MPlayer-cvslog] r35813 - trunk/libmpcodecs/vd_ffmpeg.c

[Alexander Strasser]

diego wrote:
> Author: diego
> Date: Tue Jan 22 00:05:14 2013
> New Revision: 35813
> 
> Log:
> vd_ffmpeg: Define potentially unavailable error resilience values

  "Unset error resilience flags not available in some forks of FFmpeg"

  would have been much more accurate.

  Just for the record: I commented on -dev-eng why I dislike changes
like this. From a usability stand point it is very bad to just silently
behave differently because some feature is not available.

  Especially for this change, the documented default of the option will
be changed to whatever the forked FFmpeg does => maybe something else
than what AV_EF_COMPLIANT|AV_EF_CAREFUL would do.

  Additionally the whole option will not be useful for the fork because
whatever you set will have no effect anymore it will just use whatever
the fork chooses by default.

  As this does not apply to versions compiled and linked with FFmpeg
I will not insist on any changes. So no need for fighting...


  Alexander

> 
> patch by Tomáš Chvátal, scarabeus gentoo org
> 
> Modified:
>    trunk/libmpcodecs/vd_ffmpeg.c
> 
> Modified: trunk/libmpcodecs/vd_ffmpeg.c
> ==============================================================================
> --- trunk/libmpcodecs/vd_ffmpeg.c	Tue Jan 22 00:05:12 2013	(r35812)
> +++ trunk/libmpcodecs/vd_ffmpeg.c	Tue Jan 22 00:05:14 2013	(r35813)
> @@ -47,6 +47,18 @@ LIBVD_EXTERN(ffmpeg)
>  
>  #include "libavcodec/avcodec.h"
>  
> +#ifndef AV_EF_COMPLIANT
> +#define AV_EF_COMPLIANT 0
> +#endif
> +
> +#ifndef AV_EF_CAREFUL
> +#define AV_EF_CAREFUL 0
> +#endif
> +
> +#ifndef AV_EF_AGGRESSIVE
> +#define AV_EF_AGGRESSIVE 0
> +#endif
> +
>  #if AVPALETTE_SIZE > 1024
>  #error palette too large, adapt libmpcodecs/vf.c:vf_get_image
>  #endif