diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
| commit | 53ce9905134e042516ddd7a4476dc668c0b094c4 (patch) | |
| tree | 05e80abb4ef8b78c7c93bc920b32fb34ac268cc7 /libavformat/rtmpproto.c | |
| parent | a48b890392aa22033f182421ba9e3f3b3256461d (diff) | |
| parent | 154486f9adc621e620dacd76d78c30a02cc1dcd3 (diff) | |
| download | ffmpeg-53ce9905134e042516ddd7a4476dc668c0b094c4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt: Add av_opt_set_bin()
avconv: Display the error returned by avformat_write_header
rtpenc_chain: Return an error code instead of just a plain pointer
rtpenc_chain: Free the URLContext on failure
rtpenc: Expose the ssrc as an avoption
avprobe: display the codec profile in show_stream()
avprobe: fix function prototype
cosmetics: Fix indentation
avprobe: changelog entry
avprobe: update documentation
avprobe: provide JSON output
avprobe: output proper INI format
avprobe: improve formatting
rtmp: fix url parsing
fate: document TARGET_EXEC and its usage
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffprobe.texi
ffprobe.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 0f643e6c8a..a9e39a50bb 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1037,9 +1037,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) fname = next; rt->app[0] = '\0'; } else { + // make sure we do not mismatch a playpath for an application instance char *c = strchr(p + 1, ':'); fname = strchr(p + 1, '/'); - if (!fname || c < fname) { + if (!fname || (c && c < fname)) { fname = p + 1; av_strlcpy(rt->app, path + 1, p - path); } else { |