[FFmpeg-devel] [PATCH]Do not change flv codec if user forced a codec_id

[Carl Eugen Hoyos]

Michael Niedermayer <michaelni <at> gmx.at> writes:

> > +++ b/libavformat/flvdec.c
> > @@ -713,13 +713,13 @@ static int flv_read_packet
> >  st = s->streams[i];
> >  if (stream_type == FLV_STREAM_TYPE_AUDIO) {
> >      if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
> > -        flv_same_audio_codec(st->codec, flags)) {
> > +        (s->audio_codec_id || flv_same_audio_codec(st->codec, flags))) {
> 
> i think the check shoukld be in flv_same_audio_codec after
> bits_per_coded_sample

this does not work;-(

Original patch applied, thank you, Carl Eugen