diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 11:40:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 11:40:37 +0100 |
| commit | fd464d4d01b313eccc423cac8811d2b4b970ea6f (patch) | |
| tree | e5f5884efc9e63c3b3db215ce4116cf7370c763c /libavformat | |
| parent | 454c5d10b29361ab638b4f8189dea2a121f3f372 (diff) | |
| parent | 8fbab7a6c84fd75de4f752b412cea8032604f75b (diff) | |
| download | ffmpeg-fd464d4d01b313eccc423cac8811d2b4b970ea6f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Initialize some variables to silence compiler warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec_vp8.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index a1f17019fb..3d74f59729 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -424,7 +424,7 @@ int ff_rtp_send_rtcp_feedback(RTPDemuxContext *s, URLContext *fd, AVIOContext *pb; uint8_t *buf; int64_t now; - uint16_t first_missing, missing_mask; + uint16_t first_missing = 0, missing_mask = 0; if (!fd && !avio) return -1; diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 623d3599f5..b4b4f2207d 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -82,7 +82,7 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, keyidx_present = 0; int pictureid = -1, pictureid_mask = 0; int returned_old_frame = 0; - uint32_t old_timestamp; + uint32_t old_timestamp = 0; if (!buf) { if (vp8->data) { |