diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
| commit | d0bf3bf1ffaf810d8e0737847666a9b86ea5929f (patch) | |
| tree | bc4e81051e590e5d33b401b6488ce381a37c6151 /libavresample/resample.h | |
| parent | 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb (diff) | |
| parent | bdefe22b8e8c5c1cbcb20595b8eedc052aa8e6e9 (diff) | |
| download | ffmpeg-d0bf3bf1ffaf810d8e0737847666a9b86ea5929f.tar.gz | |
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>
Diffstat (limited to 'libavresample/resample.h')
0 files changed, 0 insertions, 0 deletions