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)
commit1beea3b8592469860c50a4e977faddad33f02b17
tree3984dcf1f021febfc247111e3193552208b18158
parent0baea332cb42c254ee57a91a6c0cc36874c44621
parent3756b306a259d1376ce90404771c4d0ea7e23162
Merge commit '3756b306a259d1376ce90404771c4d0ea7e23162' into release/1.1

* commit '3756b306a259d1376ce90404771c4d0ea7e23162':
  rmenc: limit packet size

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