Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:01:44 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:01:44 +0000 (21:01 +0100)
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c

@@@ -179,9 -179,9 +179,9 @@@ static int sdp_parse_fmtp_config_h264(A
      return 0;
  }
  
 -int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
 +int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
                                       const uint8_t *buf, int len,
-                                      int start_skip, int *nal_counters,
+                                      int skip_between, int *nal_counters,
                                       int nal_mask)
  {
      int pass         = 0;
@@@ -321,9 -317,15 +321,15 @@@ static int hevc_handle_packet(AVFormatC
          buf += RTP_HEVC_PAYLOAD_HEADER_SIZE;
          len -= RTP_HEVC_PAYLOAD_HEADER_SIZE;
  
 -        res = ff_h264_handle_aggregated_packet(ctx, pkt, buf, len,
+         /* pass the HEVC DONL field */
+         if (rtp_hevc_ctx->using_donl_field) {
+             buf += RTP_HEVC_DONL_FIELD_SIZE;
+             len -= RTP_HEVC_DONL_FIELD_SIZE;
+         }
 +        res = ff_h264_handle_aggregated_packet(ctx, rtp_hevc_ctx, pkt, buf, len,
                                                 rtp_hevc_ctx->using_donl_field ?
-                                                RTP_HEVC_DONL_FIELD_SIZE : 0,
+                                                RTP_HEVC_DOND_FIELD_SIZE : 0,
                                                 NULL, 0);
          if (res < 0)
              return res;