diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:15 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:15 +0100 |
commit | a51b192f3b8f89a1bafba629655df55348b14195 (patch) | |
tree | 51a19ca6a9121e3bb96ce2d8deb6340e34d1bafa /libavformat/rtpdec_xiph.c | |
parent | 8c6651a14db2f8d8ff53b6fb17f55a4d8ae8c379 (diff) | |
parent | db158f0dd217cf839be8af195d66cf49a76537a8 (diff) |
Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'
* commit 'db158f0dd217cf839be8af195d66cf49a76537a8':
rtpdec: Remove unnecessary _if_needed suffixes on functions
Conflicts:
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_xiph.c')
-rw-r--r-- | libavformat/rtpdec_xiph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 1d7bbee06f..6712b78631 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -54,7 +54,7 @@ static PayloadContext *xiph_new_context(void) return av_mallocz(sizeof(PayloadContext)); } -static inline void free_fragment_if_needed(PayloadContext * data) +static inline void free_fragment(PayloadContext * data) { if (data->fragment) { uint8_t* p; @@ -66,7 +66,7 @@ static inline void free_fragment_if_needed(PayloadContext * data) static void xiph_free_context(PayloadContext * data) { - free_fragment_if_needed(data); + free_fragment(data); av_freep(&data->split_buf); av_freep(&data); } @@ -183,7 +183,7 @@ static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data, int res; // end packet has been lost somewhere, so drop buffered data - free_fragment_if_needed(data); + free_fragment(data); if((res = avio_open_dyn_buf(&data->fragment)) < 0) return res; @@ -196,7 +196,7 @@ static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data, if (data->timestamp != *timestamp) { // skip if fragmented timestamp is incorrect; // a start packet has been lost somewhere - free_fragment_if_needed(data); + free_fragment(data); av_log(ctx, AV_LOG_ERROR, "RTP timestamps don't match!\n"); return AVERROR_INVALIDDATA; } |