diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 22:12:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 22:12:53 +0100 |
| commit | cdce0e8a506cafebe47736d891f5b645b57d14b2 (patch) | |
| tree | e3f74dcb0806d75ae334c0a035c74aa20ad247e4 /libswresample/swresample_internal.h | |
| parent | 220f0927b86f5a0d598949257ed22be946fa7f19 (diff) | |
| parent | 2115a3597457231a6e5c0527fe0ff8550f64b733 (diff) | |
| download | ffmpeg-cdce0e8a506cafebe47736d891f5b645b57d14b2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: make av_probe_input_buffer more robust
Conflicts:
libavformat/utils.c
Not merged as it depends on previous buggy changes
See: e74cd2f4706f71da5e9205003c1d8263b54ed3fb
See: ececbedaa86cddd883f6cdc12cdd1a75a0023550
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_internal.h')
0 files changed, 0 insertions, 0 deletions