Merge commit 'cb70a93c'
* commit 'cb70a93c': lavc: Document interaction between avcodec_open2() and decoding routines Conflicts: libavcodec/avcodec.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment