Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Sep 2012 12:25:21 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Sep 2012 12:44:32 +0000 (14:44 +0200)
* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/arm/dsputil_arm.S
libavcodec/arm/vp8_armv6.S
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavformat/matroskadec.c
libavformat/utils.c
libavutil/arm/asm.S

diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -689,24 -624,21 +689,28 @@@ static void probe_codec(AVFormatContex
              pd->buf_size += pkt->size;
              memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
          } else {
 +no_packet:
              st->probe_packets = 0;
 -                av_log(s, AV_LOG_ERROR, "nothing to probe for stream %d\n",
+             if (!pd->buf_size) {
 -                return;
++                av_log(s, AV_LOG_WARNING, "nothing to probe for stream %d\n",
+                        st->index);
+             }
          }
  
 -        if (!st->probe_packets ||
 -            av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)) {
 -            set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);
 -            if(st->codec->codec_id != AV_CODEC_ID_PROBE){
 +        end=    s->raw_packet_buffer_remaining_size <= 0
 +                || st->probe_packets<=0;
 +
 +        if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
 +            int score= set_codec_from_probe_data(s, st, pd);
 +            if(    (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_MAX/4)
 +                || end){
                  pd->buf_size=0;
                  av_freep(&pd->buf);
 -                av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index);
 +                st->request_probe= -1;
 +                if(st->codec->codec_id != AV_CODEC_ID_NONE){
 +                    av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index);
 +                }else
 +                    av_log(s, AV_LOG_WARNING, "probed stream %d failed\n", st->index);
              }
          }
      }
Simple merge