diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 00:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 00:27:40 +0200 |
| commit | 7dea2eab7e3b37126f376fa73fc1242b42bd3db8 (patch) | |
| tree | d0bba3d170bb3c6438d80451734fb49507d5583a /libavdevice/fbdev.c | |
| parent | bcac6b438e67946199c75c189bba76de6c04dac4 (diff) | |
| parent | 5c2be81b39ce1e694f33b59057a0878a8e0ad111 (diff) | |
| download | ffmpeg-7dea2eab7e3b37126f376fa73fc1242b42bd3db8.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not suggest to increase probesize for image2 files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/fbdev.c')
0 files changed, 0 insertions, 0 deletions