-
Michael Niedermayer authored
* commit 'bb4edddd': rmenc: limit packet size Conflicts: libavformat/rmenc.c See: 08728f40Merged-by: Michael Niedermayer <michaelni@gmx.at>
be07270b
* commit 'bb4edddd': rmenc: limit packet size Conflicts: libavformat/rmenc.c See: 08728f40Merged-by: Michael Niedermayer <michaelni@gmx.at>