Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:55:06 +0000 (13:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 13:12:37 +0000 (14:12 +0100)
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
  lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:
libavcodec/mpeg4videodec.c

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

Simple merge
Simple merge
@@@ -1948,6 -1894,6 +1948,7 @@@ static int decode_user_data(MpegEncCont
  
  static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){
      int time_incr, time_increment;
++    int64_t pts;
  
      s->pict_type = get_bits(gb, 2) + AV_PICTURE_TYPE_I;        /* pict type: I = 0 , P = 1 */
      if(s->pict_type==AV_PICTURE_TYPE_B && s->low_delay && s->vol_control_parameters==0 && !(s->flags & CODEC_FLAG_LOW_DELAY)){
          }
      }
  
-         s->current_picture_ptr->f.pts = ROUNDED_DIV(s->time, s->avctx->time_base.num);
 +    if(s->avctx->time_base.num)
-         s->current_picture_ptr->f.pts = AV_NOPTS_VALUE;
++        pts = ROUNDED_DIV(s->time, s->avctx->time_base.num);
 +    else
-                s->current_picture_ptr->f.pts);
++        pts = AV_NOPTS_VALUE;
 +    if(s->avctx->debug&FF_DEBUG_PTS)
 +        av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n",
++               pts);
 +
      check_marker(gb, "before vop_coded");
  
      /* vop coded */