Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:29:30 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:32:53 +0000 (20:32 +0200)
commitf02221d65143aa9a5719fa83f159daaa1308b6a0
treeaa80ba90519d368f637ec168d65a627a605205b6
parent92c49737522112e9cbe60725cd221046b74b7e1f
parentf6b3dce952d66f87883a50d90d6e98416ee397df
Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2

* commit 'f6b3dce952d66f87883a50d90d6e98416ee397df':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
libavformat/librtmp.c

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