ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Mar 
 9 13:25:45 2015 +0100| [19640e99dfd6c0d9734efbdaeff84b7c67ca4883] | committer: 
Michael Niedermayer

Merge commit '0051174c70810b66378cf8ea093eab01302f6049' into release/2.2

* commit '0051174c70810b66378cf8ea093eab01302f6049':
  rmenc: limit packet size

Conflicts:
        libavformat/rmenc.c

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

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to