RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'

Browse Source 
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
  rtpdec_mpeg4: reassemble fragmented AAC frames

Conflicts:
	libavformat/rtpdec_mpeg4.c

See: fee2cc39be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-22 01:58:55 +01:00
commit 20f5a17956
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtpdec_mpeg4.c
View File

@ -218,9 +218,9 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
data->timestamp = *timestamp; data->timestamp = *timestamp;
} }
if (data->timestamp != *timestamp if (data->timestamp != *timestamp ||
|| data->au_headers[0].size != data->buf_size data->au_headers[0].size != data->buf_size ||
|| data->buf_pos + len > MAX_AAC_HBR_FRAME_SIZE) { data->buf_pos + len > MAX_AAC_HBR_FRAME_SIZE) {
data->buf_pos = 0; data->buf_pos = 0;
data->buf_size = 0; data->buf_size = 0;
av_log(ctx, AV_LOG_ERROR, "Invalid packet received\n"); av_log(ctx, AV_LOG_ERROR, "Invalid packet received\n");