Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:12:52 +0000 (19:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:12:52 +0000 (19:12 +0200)
* commit '865461099e062de5a3a109c2a5be98004c11d8bd':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
libavformat/librtmp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/librtmp.c

@@@ -229,13 -231,9 +231,12 @@@ static int rtmp_open(URLContext *s, con
      }
  
      s->is_streamed = 1;
-     rc = 0;
+     return 0;
  fail:
-     if (filename != s->filename)
-         av_freep(&filename);
+     av_freep(&ctx->temp_filename);
 +    if (rc)
 +        RTMP_Close(r);
 +
      return rc;
  }