Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)
* 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>
1  2 
libavformat/rtpdec_h264.c

@@@ -301,8 -302,7 +302,7 @@@ static int h264_handle_packet(AVFormatC
          // consume the STAP-A NAL
          buf++;
          len--;
-         // first we are going to figure out the total size
 -        result = h264_handle_packet_stap_a(ctx, pkt, buf, len);
 +        result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len);
          break;
  
      case 25:                   // STAP-B