mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: libopenjpeg: support YUV and deep RGB pixel formats Fix typo in v410 decoder. vf_yadif: unset cur_buf on the input link. vf_overlay: ensure the overlay frame does not get leaked. vf_overlay: prevent premature freeing of cur_buf Support urlencoded http authentication credentials rtmp: Return an error when the client bandwidth is incorrect rtmp: Return proper error code in handle_server_bw rtmp: Return proper error code in handle_client_bw rtmp: Return proper error codes in handle_chunk_size lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() vp8: Replace x*155/100 by x*101581>>16. vp3: don't use calls to inline asm in yasm code. x86/dsputil: put inline asm under HAVE_INLINE_ASM. dsputil_mmx: fix incorrect assembly code rtmp: Factorize the code by adding handle_invoke rtmp: Factorize the code by adding handle_chunk_size rtmp: Factorize the code by adding handle_ping rtmp: Factorize the code by adding handle_client_bw rtmp: Factorize the code by adding handle_server_bw Conflicts: libavcodec/libopenjpegdec.c libavcodec/x86/dsputil_mmx.c libavfilter/vf_overlay.c libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/28/head
Michael Niedermayer
13 years ago
commit
7333798c85
19 changed files with 484 additions and 185 deletions
@ -0,0 +1,87 @@ |
|||||||
|
/*
|
||||||
|
* Simple URL decoding function |
||||||
|
* Copyright (c) 2012 Antti Seppälä |
||||||
|
* |
||||||
|
* References: |
||||||
|
* RFC 3986: Uniform Resource Identifier (URI): Generic Syntax |
||||||
|
* T. Berners-Lee et al. The Internet Society, 2005 |
||||||
|
* |
||||||
|
* based on http://www.icosaedro.it/apache/urldecode.c
|
||||||
|
* from Umberto Salsi (salsi@icosaedro.it) |
||||||
|
* |
||||||
|
* 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 <ctype.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "libavutil/mem.h" |
||||||
|
#include "libavutil/avstring.h" |
||||||
|
#include "urldecode.h" |
||||||
|
|
||||||
|
char *ff_urldecode(const char *url) |
||||||
|
{ |
||||||
|
int s = 0, d = 0, url_len = 0; |
||||||
|
char c; |
||||||
|
char *dest = NULL; |
||||||
|
|
||||||
|
if (!url) |
||||||
|
return NULL; |
||||||
|
|
||||||
|
url_len = strlen(url) + 1; |
||||||
|
dest = av_malloc(url_len); |
||||||
|
|
||||||
|
if (!dest) |
||||||
|
return NULL; |
||||||
|
|
||||||
|
while (s < url_len) { |
||||||
|
c = url[s++]; |
||||||
|
|
||||||
|
if (c == '%' && s + 2 < url_len) { |
||||||
|
char c2 = url[s++]; |
||||||
|
char c3 = url[s++]; |
||||||
|
if (isxdigit(c2) && isxdigit(c3)) { |
||||||
|
c2 = av_tolower(c2); |
||||||
|
c3 = av_tolower(c3); |
||||||
|
|
||||||
|
if (c2 <= '9') |
||||||
|
c2 = c2 - '0'; |
||||||
|
else |
||||||
|
c2 = c2 - 'a' + 10; |
||||||
|
|
||||||
|
if (c3 <= '9') |
||||||
|
c3 = c3 - '0'; |
||||||
|
else |
||||||
|
c3 = c3 - 'a' + 10; |
||||||
|
|
||||||
|
dest[d++] = 16 * c2 + c3; |
||||||
|
|
||||||
|
} else { /* %zz or something other invalid */ |
||||||
|
dest[d++] = c; |
||||||
|
dest[d++] = c2; |
||||||
|
dest[d++] = c3; |
||||||
|
} |
||||||
|
} else if (c == '+') { |
||||||
|
dest[d++] = ' '; |
||||||
|
} else { |
||||||
|
dest[d++] = c; |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
return dest; |
||||||
|
} |
||||||
@ -0,0 +1,35 @@ |
|||||||
|
/*
|
||||||
|
* 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 |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef AVFORMAT_URLDECODE_H |
||||||
|
#define AVFORMAT_URLDECODE_H |
||||||
|
|
||||||
|
/**
|
||||||
|
* Decodes an URL from its percent-encoded form back into normal |
||||||
|
* representation. This function returns the decoded URL in a string. |
||||||
|
* The URL to be decoded does not necessarily have to be encoded but |
||||||
|
* in that case the original string is duplicated. |
||||||
|
* |
||||||
|
* @param url a string to be decoded. |
||||||
|
* @return new string with the URL decoded or NULL if decoding failed. |
||||||
|
* Note that the returned string should be explicitly freed when not |
||||||
|
* used anymore. |
||||||
|
*/ |
||||||
|
char *ff_urldecode(const char *url); |
||||||
|
|
||||||
|
#endif /* AVFORMAT_URLDECODE_H */ |
||||||
Loading…
Reference in new issue