diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 22:19:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 22:46:22 +0100 |
| commit | bd75651378da81b8d75640c3f12765a4b9369534 (patch) | |
| tree | f7ecd397520b6c3705b7b08fca4a1a2a4d05d12f /ffmpeg.c | |
| parent | aeaca3816c2677bfdb16cbc6bc55c259ed5028ff (diff) | |
| parent | 0a7fef39fc578bd7c90fd2646299f8cad722ecb1 (diff) | |
| download | ffmpeg-bd75651378da81b8d75640c3f12765a4b9369534.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
omadec: loosen format probing constraints
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions