Merge commit '1b04eb20'
* commit '1b04eb20': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '1b04eb20': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>