[FFmpeg-devel] [PATCH] ffserver rtsp bug fixes

[Martin Storsjö]

On Mon, 17 May 2010, Howard Chu wrote:

> > @@ -3679,7 +3683,7 @@
> >                              ccs = ss->codec;
> >  #define CHECK_CODEC(x)  (ccf->x != ccs->x)
> > 
> > -                            if (CHECK_CODEC(codec) ||
> > CHECK_CODEC(codec_type)) {
> > +                            if (CHECK_CODEC(codec_id) ||
> > CHECK_CODEC(codec_type)) {
> >                                  http_log("Codecs do not match for stream
> > %d\n", i);
> >                                  matches = 0;
> >                              } else if (CHECK_CODEC(bit_rate) ||
> > CHECK_CODEC(flags)) {
> 
> The check here is comparing a stream that was just opened with
> av_open_input_file(). That function doesn't initialize any codecs, so
> ccs->codec is always NULL. Checking the codec_id is the correct step.

Applied this hunk.

// Martin