virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtpdec: Return ENOMEM if H.264 RTP fails to allocate memory for SDP extradata

Browse Source 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23848 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Josh Allmann 2010-06-28 11:25:39 +00:00 committed by Martin Storsjö
parent 016bc031eb
commit 7aa0118c46
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpdec_h264.c
View File

@ -69,7 +69,7 @@ struct PayloadContext {
#define DEAD_COOKIE (0xdeaddead) ///< Cookie for the extradata; once it is freed. #define DEAD_COOKIE (0xdeaddead) ///< Cookie for the extradata; once it is freed.
/* ---------------- private code */ /* ---------------- private code */
static void sdp_parse_fmtp_config_h264(AVStream * stream, static int sdp_parse_fmtp_config_h264(AVStream * stream,
PayloadContext * h264_data, PayloadContext * h264_data,
char *attr, char *value) char *attr, char *value)
{ {
@ -155,11 +155,13 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream,
codec->extradata_size+= sizeof(start_sequence)+packet_size; codec->extradata_size+= sizeof(start_sequence)+packet_size;
} else { } else {
av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!"); av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!");
return AVERROR(ENOMEM);
} }
} }
} }
av_log(codec, AV_LOG_DEBUG, "Extradata set to %p (size: %d)!", codec->extradata, codec->extradata_size); av_log(codec, AV_LOG_DEBUG, "Extradata set to %p (size: %d)!", codec->extradata, codec->extradata_size);
} }
return 0;
} }
// return 0 on packet, no more left, 1 on packet, 1 on partial packet... // return 0 on packet, no more left, 1 on packet, 1 on partial packet...