Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/19/head
Michael Niedermayer 12 years ago
commit fd464d4d01
  1. 2
      libavformat/rtpdec.c
  2. 2
      libavformat/rtpdec_vp8.c

@ -424,7 +424,7 @@ int ff_rtp_send_rtcp_feedback(RTPDemuxContext *s, URLContext *fd,
AVIOContext *pb; AVIOContext *pb;
uint8_t *buf; uint8_t *buf;
int64_t now; int64_t now;
uint16_t first_missing, missing_mask; uint16_t first_missing = 0, missing_mask = 0;
if (!fd && !avio) if (!fd && !avio)
return -1; return -1;

@ -82,7 +82,7 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
keyidx_present = 0; keyidx_present = 0;
int pictureid = -1, pictureid_mask = 0; int pictureid = -1, pictureid_mask = 0;
int returned_old_frame = 0; int returned_old_frame = 0;
uint32_t old_timestamp; uint32_t old_timestamp = 0;
if (!buf) { if (!buf) {
if (vp8->data) { if (vp8->data) {

Loading…
Cancel
Save