Merge commit '58c95448'
* commit '58c95448': smacker: pad the extradata allocation Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '58c95448': smacker: pad the extradata allocation Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>