Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Aug 2012 11:43:03 +0000 (13:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Aug 2012 11:43:03 +0000 (13:43 +0200)
commitd0bf3bf1ffaf810d8e0737847666a9b86ea5929f
treebc4e81051e590e5d33b401b6488ce381a37c6151
parent6fd7bf7b03c068d0f91de03bdd9b4e91695680eb
parentbdefe22b8e8c5c1cbcb20595b8eedc052aa8e6e9
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>
configure
libavformat/id3v2.c
libavformat/rtmpproto.c
libavformat/utils.c
tests/fate/filter.mak