[FFmpeg-devel] [PATCH] ASF-in-Realmedia-RTSP parser.

[Martin Storsjö]

Hi Ronald,

I guess this patchset still is mostly kind of RFC, since it doesn't work 
properly as you said...

On Thu, 10 Feb 2011, Ronald S. Bultje wrote:

> index 45ed7bb..0373a93 100644
> --- a/libavformat/rtspdec.c
> +++ b/libavformat/rtspdec.c
> @@ -283,7 +283,9 @@ retry:
>              for (i = 0; i < rt->nb_rtsp_streams; i++) {
>                  rule_nr = 0;
>                  for (r = 0; r < s->nb_streams; r++) {
> -                    if (s->streams[r]->priv_data == rt->rtsp_streams[i]) {
> +                    if (s->streams[r]->priv_data == rt->rtsp_streams[i] &&
> +                        s->streams[r]->codec->codec_type != CODEC_TYPE_DATA &&
> +                        s->streams[r]->codec->channels > 0) { // HACK for x-pn-wmt
>                          if (s->streams[r]->discard != AVDISCARD_ALL) {
>                              if (!first)
>                                  av_strlcat(rt->last_subscription, ",",

Hmm, this code still seems to rely on AVStream->priv_data pointing to the 
RTSPStream, which was removed in order to avoid leaks/double frees.

I'll send a patchset fixing that (this seems to be the only place left 
relying on AVStream->priv_data).

// Martin