-
Michael Niedermayer authored
* commit '0092c1dd': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
4cb68141
* commit '0092c1dd': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>