diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 12:07:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 12:58:26 +0200 |
| commit | db0384c9c962f403051d5441271311fd441f3675 (patch) | |
| tree | a1cb5ad0491ca2d5a871934249f0ed0f01d068e3 /ffprobe.c | |
| parent | 0a28a52d53e20e45d8ca8c977984742b15b774f8 (diff) | |
| parent | fd8189932147a524fe43532b46baa35e8be92a1b (diff) | |
| download | ffmpeg-db0384c9c962f403051d5441271311fd441f3675.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsicinav: Clip the source size to the expected maximum
Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions