diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:58:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:59:44 +0100 |
| commit | 20f5a179560ce844c9fa7886f60d61d4e2db7480 (patch) | |
| tree | 7e19bb0203482b4f3e004527fd445c0572f28c4e /libavformat/rtpdec_mpeg4.c | |
| parent | abf357a9fb2f19467bad8e3e629f8b016091eedf (diff) | |
| parent | 44dc138ed29c4dfbaf57ebc774da4c75ef113ca4 (diff) | |
Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
rtpdec_mpeg4: reassemble fragmented AAC frames
Conflicts:
libavformat/rtpdec_mpeg4.c
See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 167322b9f0..8696eb9440 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -218,9 +218,9 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data, data->timestamp = *timestamp; } - if (data->timestamp != *timestamp - || data->au_headers[0].size != data->buf_size - || data->buf_pos + len > MAX_AAC_HBR_FRAME_SIZE) { + if (data->timestamp != *timestamp || + data->au_headers[0].size != data->buf_size || + data->buf_pos + len > MAX_AAC_HBR_FRAME_SIZE) { data->buf_pos = 0; data->buf_size = 0; av_log(ctx, AV_LOG_ERROR, "Invalid packet received\n"); |