Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)
* qatar/master:
  lavf: fix signed overflow in avformat_find_stream_info()
  vp8: fix signed overflows
  motion_est: fix some signed overflows
  dca: fix signed overflow in shift
  aacdec: fix undefined shifts
  bink: Check for various out of bound writes
  bink: Check for out of bound writes when building tree
  put_bits: fix invalid shift by 32 in flush_put_bits()

Conflicts:
libavcodec/bink.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c
libavcodec/bink.c
libavcodec/dca.c
libavcodec/motion_est.c
libavcodec/put_bits.h
libavcodec/vp8.c
libavformat/utils.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2435,10 -2358,10 +2435,10 @@@ int avformat_find_stream_info(AVFormatC
          }
          {
              int64_t last = st->info->last_dts;
-             int64_t duration= pkt->dts - last;
  
-             if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){
+             if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && pkt->dts > last){
 +                double dts= pkt->dts * av_q2d(st->time_base);
+                 int64_t duration= pkt->dts - last;
 -                double dur= duration * av_q2d(st->time_base);
  
  //                if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
  //                    av_log(NULL, AV_LOG_ERROR, "%f\n", dur);