Merge commit 'bd255f9f'
* commit 'bd255f9f': lavc: set frame parameters after decoding only if necessary Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'bd255f9f': lavc: set frame parameters after decoding only if necessary Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>