ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Mon Mar 
 9 01:35:28 2015 +0100| [20655dd2ec1b3567396a8190d313e740f83a87d6] | committer: 
Michael Niedermayer

Merge commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585' into release/2.4

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

Conflicts:
        libavformat/rmenc.c

See: 73ca672fb6e6661a5e1b5d1ec3ad06bfbe144fd4
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to