diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 01:41:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 04:11:10 +0200 |
| commit | d40ff29cacf9b8ffa1061392a0e9b3056c4882ea (patch) | |
| tree | 3b59f4b9a74e209220f0b0dcb90c466e3e4a9b3d /libavformat/sdp.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/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 77b8945a25..caa661bbc2 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -88,7 +88,7 @@ static void sdp_write_header(char *buff, int size, struct sdp_session_level *s) static int resolve_destination(char *dest_addr, int size, char *type, int type_size) { - struct addrinfo hints, *ai; + struct addrinfo hints = { 0 }, *ai; int is_multicast; av_strlcpy(type, "IP4", type_size); @@ -98,7 +98,6 @@ static int resolve_destination(char *dest_addr, int size, char *type, /* Resolve the destination, since it must be written * as a numeric IP address in the SDP. */ - memset(&hints, 0, sizeof(hints)); if (getaddrinfo(dest_addr, NULL, &hints, &ai)) return 0; getnameinfo(ai->ai_addr, ai->ai_addrlen, dest_addr, size, @@ -581,12 +580,11 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size) { AVDictionaryEntry *title = av_dict_get(ac[0]->metadata, "title", NULL, 0); - struct sdp_session_level s; + struct sdp_session_level s = { 0 }; int i, j, port, ttl, is_multicast; char dst[32], dst_type[5]; memset(buf, 0, size); - memset(&s, 0, sizeof(struct sdp_session_level)); s.user = "-"; s.src_addr = "127.0.0.1"; /* FIXME: Properly set this */ s.src_type = "IP4"; |