Merge commit '2a66a580'

* commit '2a66a580':
  rtpdec_mpa_robust: Fix incrementing split_pos

Conflicts:
	libavformat/rtpdec_mpa_robust.c

See: ebf1f512Merged-by: Michael Niedermayer <michaelni@gmx.at>

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);