diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 09:48:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 09:48:34 +0100 |
| commit | 02223f4dc4da797030d932ef5d186be9c9aff9ae (patch) | |
| tree | be1219fabd9e336d9636bada64f6f2812a517245 | |
| parent | 525289ed261fb54366fc0983cbb13af0a0e3d8ca (diff) | |
| parent | d1c229cdbc07ef8eb703d68d1c5b509baee85245 (diff) | |
Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
lavf: do not use int to store an int64
Conflicts:
libavformat/utils.c
See: ad56535dd1d7204ea0958decac15e8dfc86162ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions