Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'

* commit '16163e6bf2d446c06d4dd053c0852074bb50508d':
  rtpdec_h264: Fix nal type counting after refactoring

Conflicts:
	libavformat/rtpdec_h264.c

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

diff --cc libavformat/rtpdec_h264.c
index 4d4170e,f8167a9..1062439
--- 1/libavformat/rtpdec_h264.c
--- 2/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@@ -176,9 -179,10 +179,10 @@@ 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,
-                                      int start_skip)
+                                      int start_skip, int *nal_counters,
+                                      int nal_mask)
  {
      int pass         = 0;
      int total_length = 0;
@@@ -235,8 -240,9 +240,9 @@@
      return 0;
  }
  
 -static int h264_handle_packet_fu_a(AVFormatContext *ctx, AVPacket *pkt,
 +static int h264_handle_packet_fu_a(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
-                                    const uint8_t *buf, int len)
+                                    const uint8_t *buf, int len,
+                                    int *nal_counters, int nal_mask)
  {
      uint8_t fu_indicator, fu_header, start_bit, nal_type, nal;
      int ret;
@@@ -308,7 -315,8 +315,8 @@@ static int h264_handle_packet(AVFormatC
          // consume the STAP-A NAL
          buf++;
          len--;
-         result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len, 0);
 -        result = h264_handle_packet_stap_a(ctx, pkt, buf, len, 0,
++        result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len, 0,
+                                            NAL_COUNTERS, NAL_MASK);
          break;
  
      case 25:                   // STAP-B
@@@ -322,7 -330,8 +330,8 @@@
          break;
  
      case 28:                   // FU-A (fragmented nal)
-         result = h264_handle_packet_fu_a(ctx, data, pkt, buf, len);
 -        result = h264_handle_packet_fu_a(ctx, pkt, buf, len,
++        result = h264_handle_packet_fu_a(ctx, data, pkt, buf, len,
+                                          NAL_COUNTERS, NAL_MASK);
          break;
  
      case 30:                   // undefined