diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-02 12:37:20 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-02 19:38:39 +0000 |
| commit | 4d10e817b5ea12aefa15ebe7d892d81697c2cfed (patch) | |
| tree | ca47d2f463b329a21610a830a57fb6da2f93440a | |
| parent | 605e31987ab3f69db46b09af033f780fcff63de2 (diff) | |
| download | wireshark-4d10e817b5ea12aefa15ebe7d892d81697c2cfed.tar.gz | |
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>
| -rw-r--r-- | codecs/Makefile.common | 1 | ||||
| -rw-r--r-- | ui/qt/rtp_audio_stream.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/codecs/Makefile.common b/codecs/Makefile.common index d076d3b412..e2510ba96d 100644 --- a/codecs/Makefile.common +++ b/codecs/Makefile.common @@ -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 diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index f3285320fd..ad72e52005 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -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_; |