diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:12:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:12:52 +0200 |
| commit | 1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5 (patch) | |
| tree | 83f5dc68a3945058c185e0ac1916181ea26f03d9 /libavfilter/vf_super2xsai.c | |
| parent | e592bf3d2ff7280188d32ce1699b074917600e6d (diff) | |
| parent | 865461099e062de5a3a109c2a5be98004c11d8bd (diff) | |
| download | ffmpeg-1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5.tar.gz | |
Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'
* 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>
Diffstat (limited to 'libavfilter/vf_super2xsai.c')
0 files changed, 0 insertions, 0 deletions