osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Distcheck fixes. 

Add more speex files to the distribution.

Comment out a for-now-unused variable.

Change-Id: Iea3a0fad81e2cb599209e1c30ecbdbdb153d1328
Reviewed-on: https://code.wireshark.org/review/10749
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-10-02 12:37:20 -07:00
parent 605e31987a
commit 4d10e817b5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codecs/Makefile.common
View File

@ -38,6 +38,7 @@ noinst_HEADERS = \
G726/G726decode.h \
sbc/sbc_private.h \
speex/arch.h \
speex/README.txt \
speex/speex_resampler.h \
speex/stack_alloc.h

4
ui/qt/rtp_audio_stream.cpp
View File

@ -129,7 +129,6 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const _rtp_i
// Combination of gtk/rtp_player.c:decode_rtp_stream + decode_rtp_packet
// XXX This is more messy than it should be.
size_t decoded_bytes;
SAMPLE *decode_buff = NULL;
SAMPLE *resample_buff = NULL;
spx_uint32_t cur_in_rate, visual_out_rate;
@ -162,7 +161,8 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const _rtp_i
rtp_packet.payload_data = NULL;
}
decoded_bytes = decode_rtp_packet(&rtp_packet, &decode_buff, decoders_hash_, &channels, &sample_rate);
//size_t decoded_bytes =
decode_rtp_packet(&rtp_packet, &decode_buff, decoders_hash_, &channels, &sample_rate);
write_buff = (char *) decode_buff;
write_bytes = rtp_info->info_payload_len * sample_bytes_;