Merge commit 'c24469e8'
* commit 'c24469e8': utils: add workaround for AVHWAccel in ff_get_buffer compat code configure: Remove a stray msmpeg4v1 encoder declaration Conflicts: libavcodec/utils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment