• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d0bf3bf1
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d0bf3bf1
rtmpproto.c 55.5 KB