Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'

* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
  rtpdec: Use .init instead of .alloc to set default values

Conflicts:
	libavformat/rdt.c

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

diff --cc libavformat/rdt.c
index e799770,a6baf46..68ad814
--- 1/libavformat/rdt.c
--- 2/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@@ -521,28 -524,8 +524,19 @@@ ff_real_parse_sdp_a_line (AVFormatConte
          real_parse_asm_rulebook(s, s->streams[stream_index], p);
  }
  
- static PayloadContext *
- rdt_new_context (void)
- {
-     PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
-     if (!rdt)
-         return NULL;
- 
-     rdt->rmctx = avformat_alloc_context();
-     if (!rdt->rmctx)
-         av_freep(&rdt);
 +
-     return rdt;
- }
 +
- static int
- rdt_init_context (AVFormatContext *s, int st_index, PayloadContext *rdt)
+ static av_cold int rdt_init(AVFormatContext *s, int st_index, PayloadContext *rdt)
  {
 +    int ret;
 +
++    rdt->rmctx = avformat_alloc_context();
++    if (!rdt->rmctx)
++        return AVERROR(ENOMEM);
++
 +    if ((ret = ff_copy_whitelists(rdt->rmctx, s)) < 0)
 +        return ret;
 +
      return avformat_open_input(&rdt->rmctx, "", &ff_rdt_demuxer, NULL);
  }
  

diff --cc libavformat/rtpdec_amr.c
Simple merge

diff --cc libavformat/rtpdec_vp8.c
Simple merge