Diff from initial patchset: - directly include libavcodec/ffjni.c from libavformat/file.c instead of migrating ffjni to libavutil (avpriv_*) - check that the passed application context reference is a global one and error out if it's not the case -- Matthieu