Merge commit '3756b306a259d1376ce90404771c4d0ea7e23162' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:48:40 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:48:44 +0000 (13:48 +0100)
* commit '3756b306a259d1376ce90404771c4d0ea7e23162':
  rmenc: limit packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rmenc.c

Simple merge