Merge commit 'd1c229cd'
* commit 'd1c229cd': lavf: do not use int to store an int64 Conflicts: libavformat/utils.c See: ad56535dMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'd1c229cd': lavf: do not use int to store an int64 Conflicts: libavformat/utils.c See: ad56535dMerged-by: Michael Niedermayer <michaelni@gmx.at>