-
Michael Niedermayer authored
* commit '2ef2f60b': rmenc: limit packet size Conflicts: libavformat/rmenc.c See: 73ca672fMerged-by:
Michael Niedermayer <michaelni@gmx.at>
20655dd2
* commit '2ef2f60b': rmenc: limit packet size Conflicts: libavformat/rmenc.c See: 73ca672fMerged-by:Michael Niedermayer <michaelni@gmx.at>