Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'

* commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a':
  rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc

Conflicts:
	libavformat/rtpdec_h264.c

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

diff --cc libavformat/rtpdec_h264.c
index 39e2b9c,e6c8c26..4d4170e
--- 1/libavformat/rtpdec_h264.c
--- 2/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@@ -176,8 -176,9 +176,9 @@@ static int sdp_parse_fmtp_config_h264(A
      return 0;
  }
  
 -static int h264_handle_packet_stap_a(AVFormatContext *ctx, AVPacket *pkt,
 +static int h264_handle_packet_stap_a(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
-                                      const uint8_t *buf, int len)
+                                      const uint8_t *buf, int len,
+                                      int start_skip)
  {
      int pass         = 0;
      int total_length = 0;
@@@ -304,7 -308,7 +308,7 @@@ static int h264_handle_packet(AVFormatC
          // consume the STAP-A NAL
          buf++;
          len--;
-         result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len);
 -        result = h264_handle_packet_stap_a(ctx, pkt, buf, len, 0);
++        result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len, 0);
          break;
  
      case 25:                   // STAP-B