Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:24:27 +0000 (20:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:24:58 +0000 (20:24 +0100)
commitbe07270bcaae0dc2a32f9b11d4a73d6f6a8564e3
tree74b4ec68da0067513ed17c2ce89fdcd3a764c325
parent6af5bf604c97e9f4c686d9ca480d12613dc64277
parentbb4edddd9389cc1601db618ed3c1375b62628d04
Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'

* commit 'bb4edddd9389cc1601db618ed3c1375b62628d04':
  rmenc: limit packet size

Conflicts:
libavformat/rmenc.c

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