diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 21:00:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 21:00:33 +0100 |
| commit | 8f92c0898d2b042374d98ab60ec4dd57f4dc2874 (patch) | |
| tree | 0797121836f1ed9a3e92666a25ae067ee8869008 /libavdevice | |
| parent | 2e8020c66ccb51ca8dab47cd4fcb15f5c0277bbf (diff) | |
| parent | ad94c6ca0b86c463f476b26606259a2041dcddc9 (diff) | |
| download | ffmpeg-8f92c0898d2b042374d98ab60ec4dd57f4dc2874.tar.gz | |
Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'
* commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9':
siff: Use the correct type for packet size variables
Conflicts:
libavformat/siff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions