diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:29:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:32:53 +0200 |
| commit | f02221d65143aa9a5719fa83f159daaa1308b6a0 (patch) | |
| tree | aa80ba90519d368f637ec168d65a627a605205b6 /libavformat/jvdec.c | |
| parent | 92c49737522112e9cbe60725cd221046b74b7e1f (diff) | |
| parent | f6b3dce952d66f87883a50d90d6e98416ee397df (diff) | |
| download | ffmpeg-f02221d65143aa9a5719fa83f159daaa1308b6a0.tar.gz | |
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>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions