-
- Downloads
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>
No related branches found
No related tags found
Showing
- configure 28 additions, 28 deletionsconfigure
- libavformat/id3v2.c 1 addition, 1 deletionlibavformat/id3v2.c
- libavformat/rtmpproto.c 43 additions, 24 deletionslibavformat/rtmpproto.c
- libavformat/utils.c 19 additions, 0 deletionslibavformat/utils.c
- libavresample/resample.c 2 additions, 15 deletionslibavresample/resample.c
- tests/fate/filter.mak 6 additions, 6 deletionstests/fate/filter.mak
Loading
Please register or sign in to comment