[FFmpeg-cvslog] Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  5 20:24:27 2015 +0100| [be07270bcaae0dc2a32f9b11d4a73d6f6a8564e3] | committer: Michael Niedermayer

Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'

* commit 'bb4edddd9389cc1601db618ed3c1375b62628d04':
  rmenc: limit packet size

Conflicts:
	libavformat/rmenc.c

See: 08728f400b8367dc8c983036cb2eff3a2891322b
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be07270bcaae0dc2a32f9b11d4a73d6f6a8564e3
---