Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:17:18 +0000 (19:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:19:28 +0000 (19:19 +0200)
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_parser.c

@@@ -215,12 -181,8 +215,9 @@@ static inline int parse_nal_units(AVCod
      s->key_frame         = 0;
      s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;
  
-     h->avctx                        = avctx;
-     h->sei_recovery_frame_cnt       = -1;
-     h->sei_dpb_output_delay         = 0;
-     h->sei_cpb_removal_delay        = -1;
-     h->sei_buffering_period_present = 0;
+     h->avctx = avctx;
+     ff_h264_reset_sei(h);
 +    h->sei_fpa.frame_packing_arrangement_cancel_flag = -1;
  
      if (!buf_size)
          return 0;