From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 12 Aug 2012 11:43:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~10127
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d0bf3bf1ffaf810d8e0737847666a9b86ea5929f;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
  lavf: Initialize the stream info timestamps in avformat_new_stream
  id3v2: Match PIC mimetype/format case-insensitively
  configure: Rename check_asm() to more fitting check_inline_asm()
  fate: Only test enabled filters
  avresample: De-doxygenize some comments where Doxygen is not appropriate
  rtmp: split chunk_size var into in_chunk_size and out_chunk_size
  rtmp: Factorize the code by adding find_tracked_method

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

d0bf3bf1ffaf810d8e0737847666a9b86ea5929f
diff --cc configure
index 7754da9784,a284b771a2..fa8a65bf36
--- a/configure
+++ b/configure
@@@ -3137,17 -2847,8 +3137,16 @@@ EO
  
  elif enabled mips; then
  
-     check_asm loongson '"dmult.g $1, $2, $3"'
-     enabled mmi     && check_asm mmi     '"lq $2, 0($2)"'
+     check_inline_asm loongson '"dmult.g $1, $2, $3"'
+     enabled mmi && check_inline_asm mmi '"lq $2, 0($2)"'
 +    enabled mips32r2  && add_cflags "-mips32r2" &&
-      check_asm mips32r2  '"rotr $t0, $t1, 1"'
++     check_inline_asm mips32r2  '"rotr $t0, $t1, 1"'
 +    enabled mipsdspr1 && add_cflags "-mdsp" && add_asflags "-mdsp" &&
-      check_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"'
++     check_inline_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"'
 +    enabled mipsdspr2 && add_cflags "-mdspr2" && add_asflags "-mdspr2" &&
-      check_asm mipsdspr2 '"absq_s.qb $t0, $t1"'
++     check_inline_asm mipsdspr2 '"absq_s.qb $t0, $t1"'
 +    enabled mipsfpu   && add_cflags "-mhard-float" &&
-      check_asm mipsfpu   '"madd.d $f0, $f2, $f4, $f6"'
- 
++     check_inline_asm mipsfpu   '"madd.d $f0, $f2, $f4, $f6"'
  
  elif enabled ppc; then
  
diff --cc tests/fate/filter.mak
index 0d15ddbfbf,f16aee19cc..0b3e9434c3
--- a/tests/fate/filter.mak
+++ b/tests/fate/filter.mak
@@@ -18,11 -18,11 +18,11 @@@ $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tes
  $(FATE_AMIX): CMP  = oneoff
  $(FATE_AMIX): CMP_UNIT = f32
  
- FATE_FILTER += $(FATE_AMIX)
+ FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX)
  
- FATE_FILTER += fate-filter-asyncts
+ FATE_FILTER-$(CONFIG_ASYNCTS_FILTER) += fate-filter-asyncts
  fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv
 -fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
 +fate-filter-asyncts: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1
  fate-filter-asyncts: CMP = oneoff
  fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm