* commit '36fc320747a768335ae4538a24a5739033b7eb74': nuv: Pad the lzo outbuf nuv: Do not ignore lzo decompression failures oma: correctly mark and decrypt partial packets oma: check geob tag boundary Conflicts: libavcodec/nuv.c libavformat/omadec.c tests/ref/fate/nuv Merged-by: Michael Niedermayer <michaelni@gmx.at>