-
Michael Niedermayer authored
* commit '2219e27b': oma: correctly mark and decrypt partial packets Conflicts: libavformat/omadec.c See: dcd013a5Merged-by: Michael Niedermayer <michaelni@gmx.at>
5fb652dd
* commit '2219e27b': oma: correctly mark and decrypt partial packets Conflicts: libavformat/omadec.c See: dcd013a5Merged-by: Michael Niedermayer <michaelni@gmx.at>