diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:34:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:34:42 +0100 |
| commit | 220f0927b86f5a0d598949257ed22be946fa7f19 (patch) | |
| tree | e3f74dcb0806d75ae334c0a035c74aa20ad247e4 /common.mak | |
| parent | ececbedaa86cddd883f6cdc12cdd1a75a0023550 (diff) | |
| parent | 8b76362836f3c373c3aadc544522edcbef16dd5f (diff) | |
| download | ffmpeg-220f0927b86f5a0d598949257ed22be946fa7f19.tar.gz | |
Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'
* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
lavf: use a fixed width type
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions