Merge commit 'fe9bb61f'
* commit 'fe9bb61f': pictordec: pass correct context to avpriv_request_sample Conflicts: libavcodec/pictordec.c No change as the avpriv_request_sample() has already been replaced by an implementation of the codepath. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment