Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'

* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/rdt.c
Simple merge

diff --cc libavformat/rmdec.c
index c0afa7f,1507764..9468d97
--- 1/libavformat/rmdec.c
--- 2/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@@ -570,15 -493,15 +574,17 @@@ static int rm_read_header(AVFormatConte
              duration = avio_rb32(pb); /* duration */
              st->start_time = start_time;
              st->duration = duration;
 +            if(duration>0)
 +                s->duration = AV_NOPTS_VALUE;
              get_str8(pb, buf, sizeof(buf)); /* desc */
 -            get_str8(pb, buf, sizeof(buf)); /* mimetype */
 +            get_str8(pb, mime, sizeof(mime)); /* mimetype */
              st->codec->codec_type = AVMEDIA_TYPE_DATA;
              st->priv_data = ff_rm_alloc_rmstream();
+             if (!st->priv_data)
+                 return AVERROR(ENOMEM);
              if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
 -                                          avio_rb32(pb)) < 0)
 -                return -1;
 +                                          avio_rb32(pb), mime) < 0)
 +                goto fail;
              break;
          case MKTAG('D', 'A', 'T', 'A'):
              goto header_end;