[FFmpeg-devel] [PATCH] deprecate SAMPLE_FMT_S24

[Stefano Sabatini]

On date Thursday 2008-08-21 19:42:33 +1000, Peter Ross encoded:
[...]
> Index: libavcodec/utils.c
> ===================================================================
> --- libavcodec/utils.c	(revision 14875)
> +++ libavcodec/utils.c	(working copy)
> @@ -568,7 +568,11 @@
>  {"ec", "set error concealment strategy", OFFSET(error_concealment), FF_OPT_TYPE_FLAGS, 3, INT_MIN, INT_MAX, V|D, "ec"},
>  {"guess_mvs", "iterative motion vector (MV) search (slow)", 0, FF_OPT_TYPE_CONST, FF_EC_GUESS_MVS, INT_MIN, INT_MAX, V|D, "ec"},
>  {"deblock", "use strong deblock filter for damaged MBs", 0, FF_OPT_TYPE_CONST, FF_EC_DEBLOCK, INT_MIN, INT_MAX, V|D, "ec"},
> +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)

   #if LIBAVCODEC_VERSION_MAJOR < 52

is more readable I think (here and below).

>  {"bits_per_sample", NULL, OFFSET(bits_per_sample), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
> +#else
> +{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
> +#endif
>  {"pred", "prediction method", OFFSET(prediction_method), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "pred"},
>  {"left", NULL, 0, FF_OPT_TYPE_CONST, FF_PRED_LEFT, INT_MIN, INT_MAX, V|E, "pred"},
>  {"plane", NULL, 0, FF_OPT_TYPE_CONST, FF_PRED_PLANE, INT_MIN, INT_MAX, V|E, "pred"},
> Index: libavcodec/avcodec.h
> ===================================================================
> --- libavcodec/avcodec.h	(revision 14875)
> +++ libavcodec/avcodec.h	(working copy)
> @@ -1430,7 +1430,11 @@
>       * - encoding: Set by libavcodec.
>       * - decoding: Set by user.
>       */
> +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
>       int bits_per_sample;
> +#else
> +     int bits_per_coded_sample;
> +#endif
>  
>      /**
>       * prediction method (needed for huffyuv)

Regards.
-- 
FFmpeg = Foolish Frightening Minimal Proud Experimenting Gorilla