eadba3e94d
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
59 lines
1.9 KiB
C
59 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2012 Martin Storsjo
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "internal.h"
|
|
|
|
#undef printf
|
|
#undef exit
|
|
|
|
static void test(const char *base, const char *rel)
|
|
{
|
|
char buf[200], buf2[200];
|
|
ff_make_absolute_url(buf, sizeof(buf), base, rel);
|
|
printf("%s\n", buf);
|
|
if (base) {
|
|
/* Test in-buffer replacement */
|
|
snprintf(buf2, sizeof(buf2), "%s", base);
|
|
ff_make_absolute_url(buf2, sizeof(buf2), buf2, rel);
|
|
if (strcmp(buf, buf2)) {
|
|
printf("In-place handling of %s + %s failed\n", base, rel);
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
test(NULL, "baz");
|
|
test("/foo/bar", "baz");
|
|
test("/foo/bar", "../baz");
|
|
test("/foo/bar", "/baz");
|
|
test("http://server/foo/", "baz");
|
|
test("http://server/foo/bar", "baz");
|
|
test("http://server/foo/", "../baz");
|
|
test("http://server/foo/bar/123", "../../baz");
|
|
test("http://server/foo/bar/123", "/baz");
|
|
test("http://server/foo/bar/123", "https://other/url");
|
|
test("http://server/foo/bar?param=value/with/slashes", "/baz");
|
|
test("http://server/foo/bar?param&otherparam", "?someparam");
|
|
test("http://server/foo/bar", "//other/url");
|
|
return 0;
|
|
}
|