diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-23 22:25:55 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-24 16:21:54 +0200 |
| commit | db158f0dd217cf839be8af195d66cf49a76537a8 (patch) | |
| tree | 184b32604707d20981cd35c91f3eb911e534d8d4 | |
| parent | 353b492d0f2a21ae8eb829db1ac01b54b2a4d202 (diff) | |
| download | ffmpeg-db158f0dd217cf839be8af195d66cf49a76537a8.tar.gz | |
rtpdec: Remove unnecessary _if_needed suffixes on functions
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtpdec_jpeg.c | 8 | ||||
| -rw-r--r-- | libavformat/rtpdec_xiph.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index ed9c86ceb9..caa1bd2815 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -64,7 +64,7 @@ static PayloadContext *jpeg_new_context(void) return av_mallocz(sizeof(PayloadContext)); } -static inline void free_frame_if_needed(PayloadContext *jpeg) +static inline void free_frame(PayloadContext *jpeg) { if (jpeg->frame) { uint8_t *p; @@ -76,7 +76,7 @@ static inline void free_frame_if_needed(PayloadContext *jpeg) static void jpeg_free_context(PayloadContext *jpeg) { - free_frame_if_needed(jpeg); + free_frame(jpeg); av_free(jpeg); } @@ -321,7 +321,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, /* Skip the current frame in case of the end packet * has been lost somewhere. */ - free_frame_if_needed(jpeg); + free_frame(jpeg); if ((ret = avio_open_dyn_buf(&jpeg->frame)) < 0) return ret; @@ -347,7 +347,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, if (jpeg->timestamp != *timestamp) { /* Skip the current frame if timestamp is incorrect. * A start packet has been lost somewhere. */ - free_frame_if_needed(jpeg); + free_frame(jpeg); av_log(ctx, AV_LOG_ERROR, "RTP timestamps don't match.\n"); return AVERROR_INVALIDDATA; } diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 8f3ba18a4b..c3385e4320 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_free(data->split_buf); av_free(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; } |