Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
  rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

Conflicts:
	libavformat/rtpdec_h264.c

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

libavformat/rtpdec_h264.c

@@ -182,6 +182,7 @@ static int h264_handle_packet_stap_a(AVFormatContext *ctx, PayloadContext *data,
     uint8_t *dst     = NULL;
     int ret;
 
+    // first we are going to figure out the total size
     for (pass = 0; pass < 2; pass++) {
         const uint8_t *src = buf;
         int src_len        = len;
@@ -301,7 +302,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data,
         // consume the STAP-A NAL
         buf++;
         len--;
-        // first we are going to figure out the total size
         result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len);
         break;