Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
  h2645_parse: add support for parsing h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/h2645_parse.c
libavcodec/h2645_parse.h
libavcodec/hevc.c
libavcodec/hevc_parser.c

Simple merge
@@@ -38,12 -38,20 +38,23 @@@ typedef struct H2645NAL 
  
      GetBitContext gb;
  
+     /**
+      * NAL unit type
+      */
      int type;
+     /**
+      * HEVC only, nuh_temporal_id_plus_1 - 1
+      */
      int temporal_id;
  
 +    int skipped_bytes;
 +    int skipped_bytes_pos_size;
 +    int *skipped_bytes_pos;
+     /**
+      * H264 only, nal_ref_idc
+      */
+     int ref_idc;
  } H2645NAL;
  
  /* an input packet split into unescaped NAL units */
Simple merge
@@@ -89,7 -82,8 +89,8 @@@ static int parse_nal_units(AVCodecParse
      HEVCParserContext *ctx = s->priv_data;
      int ret, i;
  
-     ret = ff_h2645_split_packet(&ctx->pkt, buf, buf_size, avctx, 0, 0);
 -    ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0,
++    ret = ff_h2645_split_packet(&ctx->pkt, buf, buf_size, avctx, 0, 0,
+                                 AV_CODEC_ID_HEVC);
      if (ret < 0)
          return ret;