virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'

Browse Source 
* commit '2a66a580678dd9401f4d95e01e0958ca51864b6f':
  rtpdec_mpa_robust: Fix incrementing split_pos

Conflicts:
	libavformat/rtpdec_mpa_robust.c

See: ebf1f512e9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-04 11:15:05 +01:00
parent 7da7d269b8 2a66a58067
commit 5dce723715
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpdec_mpa_robust.c
View File

@@ -98,7 +98,7 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data,
pkt->stream_index = st->index; pkt->stream_index = st->index;
memcpy(pkt->data, buf, adu_size); memcpy(pkt->data, buf, adu_size);
data->split_pos = (buf - data->split_buf) + adu_size; data->split_pos += header_size + adu_size;
if (data->split_pos == data->split_buf_size) { if (data->split_pos == data->split_buf_size) {
av_freep(&data->split_buf); av_freep(&data->split_buf);