Merge commit 'c4845616'
* commit 'c4845616': lavc: add MMAL hardware decoder wrapper Conflicts: Changelog configure doc/APIchanges libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h libavutil/version.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/mmaldec.c
0 → 100644
This diff is collapsed.
Please
register
or
sign in
to comment