diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 11:15:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 11:31:55 +0100 |
| commit | 5dce723715e1f9514808f9c788b28734004f089d (patch) | |
| tree | e30292177f318a14e653257b72e67f00fb906347 | |
| parent | 7da7d269b8409b2533f4434ab10a197d5726569e (diff) | |
| parent | 2a66a580678dd9401f4d95e01e0958ca51864b6f (diff) | |
| download | ffmpeg-5dce723715e1f9514808f9c788b28734004f089d.tar.gz | |
Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'
* commit '2a66a580678dd9401f4d95e01e0958ca51864b6f':
rtpdec_mpa_robust: Fix incrementing split_pos
Conflicts:
libavformat/rtpdec_mpa_robust.c
See: ebf1f512e9916040dd96fa9f789ed4be5a39c349
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_mpa_robust.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_mpa_robust.c b/libavformat/rtpdec_mpa_robust.c index 2439f9ed98..07057fe7ce 100644 --- a/libavformat/rtpdec_mpa_robust.c +++ b/libavformat/rtpdec_mpa_robust.c @@ -98,7 +98,7 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data, pkt->stream_index = st->index; 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) { av_freep(&data->split_buf); |