diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-06-07 17:46:34 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-06-11 13:48:39 +0300 |
| commit | f862537de8ba7920e0f25318c03f8982a3c6294c (patch) | |
| tree | edeaa86366a14b1dd5755ff7274cc9de86c75ee6 /libavformat/rtmpproto.c | |
| parent | 8ee3e1874ec48f1da1a7dfbbdac7382590856a90 (diff) | |
| download | ffmpeg-f862537de8ba7920e0f25318c03f8982a3c6294c.tar.gz | |
rtmp: Do not send extension for flv files
This fixes bugzilla bug #304.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index abf9ab4c64..e9a3e4336e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1133,6 +1133,8 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if (!rt->playpath) { + int len = strlen(fname); + rt->playpath = av_malloc(PLAYPATH_MAX_LENGTH); if (!rt->playpath) { ret = AVERROR(ENOMEM); @@ -1140,9 +1142,11 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if (!strchr(fname, ':') && - (!strcmp(fname + strlen(fname) - 4, ".f4v") || - !strcmp(fname + strlen(fname) - 4, ".mp4"))) { + (!strcmp(fname + len - 4, ".f4v") || + !strcmp(fname + len - 4, ".mp4"))) { memcpy(rt->playpath, "mp4:", 5); + } else if (!strcmp(fname + len - 4, ".flv")) { + fname[len - 4] = '\0'; } else { rt->playpath[0] = 0; } |