[FFmpeg-devel] [PATCH] avformat/rtpdec_h261: code aligned to the HEVC code

[Thomas Volkert]

From: Thomas Volkert tho...@homer-conferencing.com

---
 libavformat/rtpdec_h261.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libavformat/rtpdec_h261.c b/libavformat/rtpdec_h261.c
index b902d2a..43244bb 100644
--- a/libavformat/rtpdec_h261.c
+++ b/libavformat/rtpdec_h261.c
@@ -32,7 +32,7 @@ struct PayloadContext {
 uint32_t timestamp;
 };
 
-static PayloadContext *h261_new_context(void)
+static av_cold PayloadContext *h261_new_context(void)
 {
 return av_mallocz(sizeof(PayloadContext));
 }
@@ -45,7 +45,7 @@ static void h261_free_dyn_buffer(AVIOContext **dyn_buf)
 *dyn_buf = NULL;
 }
 
-static void h261_free_context(PayloadContext *pl_ctx)
+static av_cold void h261_free_context(PayloadContext *pl_ctx)
 {
 /* return if context is invalid */
 if (!pl_ctx)
@@ -80,16 +80,14 @@ int ff_h261_handle_packet(AVFormatContext *ctx, 
PayloadContext *data,
 int sbit, ebit, gobn, mbap, quant;
 int res;
 
-//av_log(ctx, AV_LOG_DEBUG, got h261 RTP packet with time: %u\n, 
timestamp);
-
 /* drop data of previous packets in case of non-continuous (loss) packet 
stream */
 if (data-buf  data-timestamp != *timestamp) {
 h261_free_dyn_buffer(data-buf);
 }
 
-/* sanity check for size of input packet */
-if (len  5 /* 4 bytes header and 1 byte payload at least */) {
-av_log(ctx, AV_LOG_ERROR, Too short H.261 RTP packet\n);
+/* sanity check for size of input packet: 1 byte payload at least */
+if (len  RTP_H261_PAYLOAD_HEADER_SIZE + 1) {
+av_log(ctx, AV_LOG_ERROR, Too short RTP/H.261 packet, got %d 
bytes\n, len);
 return AVERROR_INVALIDDATA;
 }
 
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/rtpdec_h261: code aligned to the HEVC code

[Michael Niedermayer]

On Sat, Nov 01, 2014 at 01:01:53PM +0100, Thomas Volkert wrote:
 From: Thomas Volkert tho...@homer-conferencing.com
 
 ---
  libavformat/rtpdec_h261.c | 12 +---
  1 file changed, 5 insertions(+), 7 deletions(-)

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel