[FFmpeg-cvslog] r20623 - trunk/libavcodec/options.c

[Benjamin Larsson]

jai_menon wrote:
> Author: jai_menon
> Date: Thu Nov 26 21:46:13 2009
> New Revision: 20623
> 
> Log:
> Allow decoders to correctly set the sample format by defaulting to 
> SAMPLE_FMT_NONE in avcodec_get_context_defaults2.
> 
> Modified:
>    trunk/libavcodec/options.c
> 
> Modified: trunk/libavcodec/options.c
> ==============================================================================
> --- trunk/libavcodec/options.c	Thu Nov 26 21:00:03 2009	(r20622)
> +++ trunk/libavcodec/options.c	Thu Nov 26 21:46:13 2009	(r20623)
> @@ -437,7 +437,7 @@ void avcodec_get_context_defaults2(AVCod
>      s->execute2= avcodec_default_execute2;
>      s->sample_aspect_ratio= (AVRational){0,1};
>      s->pix_fmt= PIX_FMT_NONE;
> -    s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
> +    s->sample_fmt= SAMPLE_FMT_NONE;
>  
>      s->palctrl = NULL;
>      s->reget_buffer= avcodec_default_reget_buffer;


This broke streaming to ffserver.

MvH
Benjamin Larsson