diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 03:41:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 06:11:10 +0400 |
| commit | d40ff29cacf9b8ffa1061392a0e9b3056c4882ea (patch) | |
| tree | 3b59f4b9a74e209220f0b0dcb90c466e3e4a9b3d /libavformat/utils.c | |
| parent | 99bb88c588ea9a46a06b966b9014394385ebe1c3 (diff) | |
| parent | 44257ef4267f01dd698c8ab8abf50fd77136a8ce (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asf: only set index_read if the index contained entries.
cabac: add overread protection to BRANCHLESS_GET_CABAC().
cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
h264: add overread protection to get_cabac_bypass_sign_x86().
h264: reindent get_cabac_bypass_sign_x86().
h264: use struct offsets in get_cabac_bypass_sign_x86().
h264: fix overreads in cabac reader.
wmall: fix seeking.
lagarith: fix buffer overreads.
dvdec: drop unnecessary dv_tablegen.h #include
build: fix doc generation errors in parallel builds
Replace memset(0) by zero initializations.
faandct: Remove FAAN_POSTSCALE define and related code.
dvenc: print allowed profiles if the video doesn't conform to any of them.
avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
FATE: add a test for vp8 with changing frame size.
fate: add kgv1 fate test.
oggdec: calculate correct timestamps in Ogg/FLAC
Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 0f8b940566..7e64cf6a9f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4073,7 +4073,7 @@ int ff_url_join(char *str, int size, const char *proto, int port, const char *fmt, ...) { #if CONFIG_NETWORK - struct addrinfo hints, *ai; + struct addrinfo hints = { 0 }, *ai; #endif str[0] = '\0'; @@ -4084,7 +4084,6 @@ int ff_url_join(char *str, int size, const char *proto, #if CONFIG_NETWORK && defined(AF_INET6) /* Determine if hostname is a numerical IPv6 address, * properly escape it within [] in that case. */ - memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; if (!getaddrinfo(hostname, NULL, &hints, &ai)) { if (ai->ai_family == AF_INET6) { |