Merge commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:35:28 +0000 (01:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:36:01 +0000 (01:36 +0100)
commit20655dd2ec1b3567396a8190d313e740f83a87d6
tree52a00c84f8c9a274c03e72487c9caf341022cdbb
parent73ca672fb6e6661a5e1b5d1ec3ad06bfbe144fd4
parent2ef2f60b4f0308d1c871091c9c1a9641d14ec585
Merge commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585' into release/2.4

* commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585':
  rmenc: limit packet size

Conflicts:
libavformat/rmenc.c

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